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