mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
small adjustments in grs
This commit is contained in:
@@ -34,16 +34,18 @@ fun
|
||||
def
|
||||
one = succ zero ;
|
||||
two = succ one ;
|
||||
sum m zero = m ;
|
||||
sum m (succ n) = succ (sum m n) ;
|
||||
prod m zero = zero ;
|
||||
sum m zero = m ;
|
||||
prod m (succ n) = sum (prod m n) m ;
|
||||
prod m zero = zero ;
|
||||
LtNat m n = Exist Nat (\x -> EqNat n (sum m (succ x))) ;
|
||||
Div m n = Exist Nat (\x -> EqNat m (prod x n)) ;
|
||||
Prime n = Conj
|
||||
(LtNat one n)
|
||||
(Univ Nat (\x -> Impl (Conj (LtNat one x) (Div n x)) (EqNat x n))) ;
|
||||
|
||||
--- data Elem = zero | succ ;
|
||||
|
||||
fun ex1 : Text ;
|
||||
def ex1 =
|
||||
ThmWithProof
|
||||
|
||||
@@ -27,13 +27,15 @@ Known bugs:
|
||||
|
||||
Finnish
|
||||
Numerals (1,2,3,...) are not inflected
|
||||
Omission of subject personal pronoun not permitted
|
||||
|
||||
French
|
||||
Order of clitics with ditransitives is not fully controlled
|
||||
|
||||
Italian
|
||||
Order of clitics with ditransitives is not fully controlled
|
||||
|
||||
Order of clitics with ditransitives is not fully controlled.
|
||||
Omission of subject personal pronoun not permitted.
|
||||
Article is not omitted in "la mia madre".
|
||||
|
||||
General
|
||||
* Negative noun phrases ("nobody", "nothing", etc) in TestResource are
|
||||
@@ -44,9 +46,12 @@ General
|
||||
|
||||
Missing structures
|
||||
* Tense and aspect
|
||||
* Alternative word orders in many languages (Finnish, German, ...)
|
||||
* coordination of VP, TV, AdV
|
||||
* "I want you to go"
|
||||
* "I paint the house blue"
|
||||
" "the house that he wants to buy"
|
||||
* "the house that he wants to buy"
|
||||
|
||||
|
||||
|
||||
opyright (c) 2001-2004 Janna Khegai, Aarne Ranta
|
||||
|
||||
@@ -215,7 +215,7 @@ oper
|
||||
artDef g n c ++ qualPron g n ;
|
||||
|
||||
pronJe = mkPronoun
|
||||
"io"
|
||||
"io" --- (variants {"io" ; []}) etc
|
||||
"mi"
|
||||
"mi"
|
||||
"me"
|
||||
|
||||
@@ -17,13 +17,8 @@ WINDOWSINCLUDE =-ifor-windows $(BASICINCLUDE)
|
||||
DIST_DIR=GF-$(PACKAGE_VERSION)
|
||||
NOT_IN_DIST= \
|
||||
from-peb \
|
||||
doc/release2.html \
|
||||
grammars/resource \
|
||||
grammars/aggregation \
|
||||
grammars/numerals \
|
||||
grammars/ocl \
|
||||
grammars/testConversions \
|
||||
grammars/timetable \
|
||||
doc \
|
||||
grammars \
|
||||
src/parsing \
|
||||
src/conversions \
|
||||
src/util/AlphaConvGF.hs
|
||||
|
||||
Reference in New Issue
Block a user