GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

small adjustments in grs

Browse Source
This commit is contained in:
aarne
2004-08-09 13:22:59 +00:00
parent 60ae7ddbbe
commit 9d07bd92a8
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
grammars/logic/Arithm.gf
View File

@@ -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

9
src/Makefile
View File

@@ -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