diff options
Diffstat (limited to 'next-lib/src/api')
| -rw-r--r-- | next-lib/src/api/CombinatorsCat.gf | 2 | ||||
| -rw-r--r-- | next-lib/src/api/CombinatorsSpa.gf | 2 | ||||
| -rw-r--r-- | next-lib/src/api/ConstructorsCat.gf | 2 | ||||
| -rw-r--r-- | next-lib/src/api/Symbolic.gf | 18 | ||||
| -rw-r--r-- | next-lib/src/api/SymbolicCat.gf | 2 | ||||
| -rw-r--r-- | next-lib/src/api/SymbolicSpa.gf | 2 | ||||
| -rw-r--r-- | next-lib/src/api/SyntaxCat.gf | 5 | ||||
| -rw-r--r-- | next-lib/src/api/SyntaxSpa.gf | 2 |
8 files changed, 21 insertions, 14 deletions
diff --git a/next-lib/src/api/CombinatorsCat.gf b/next-lib/src/api/CombinatorsCat.gf index 91b9d6beb..473f5bd9b 100644 --- a/next-lib/src/api/CombinatorsCat.gf +++ b/next-lib/src/api/CombinatorsCat.gf @@ -1,4 +1,4 @@ ---# -path=.:alltenses:prelude +--# -path=.:alltenses resource CombinatorsCat = Combinators with (Cat = CatCat), diff --git a/next-lib/src/api/CombinatorsSpa.gf b/next-lib/src/api/CombinatorsSpa.gf index ece2b7b79..778c0fb3e 100644 --- a/next-lib/src/api/CombinatorsSpa.gf +++ b/next-lib/src/api/CombinatorsSpa.gf @@ -1,4 +1,4 @@ ---# -path=.:alltenses:prelude +--# -path=.:alltenses resource CombinatorsSpa = Combinators with (Cat = CatSpa), diff --git a/next-lib/src/api/ConstructorsCat.gf b/next-lib/src/api/ConstructorsCat.gf index 4efd5bad4..656b2573e 100644 --- a/next-lib/src/api/ConstructorsCat.gf +++ b/next-lib/src/api/ConstructorsCat.gf @@ -1,3 +1,3 @@ ---# -path=.:alltenses:prelude +--# -path=.:alltenses resource ConstructorsCat = Constructors with (Grammar = GrammarCat) ; diff --git a/next-lib/src/api/Symbolic.gf b/next-lib/src/api/Symbolic.gf index 6ce8478b9..732839e1c 100644 --- a/next-lib/src/api/Symbolic.gf +++ b/next-lib/src/api/Symbolic.gf @@ -1,11 +1,11 @@ --1 Symbolic: Noun Phrases with mathematical symbols -incomplete resource Symbolic = open Symbol, Grammar in { +incomplete resource Symbolic = open Symbol, Grammar, PredefCnc in { oper symb : overload { symb : Str -> NP ; -- x - symb : Integer -> NP ; -- 23 + symb : Int -> NP ; -- 23 symb : Float -> NP ; -- 0.99 symb : N -> Digits -> NP ; -- level 4 symb : N -> Card -> NP ; -- level four @@ -13,7 +13,10 @@ incomplete resource Symbolic = open Symbol, Grammar in { symb : Det -> N -> Card -> NP ; -- the number four symb : Det -> CN -> Card -> NP ; -- the even number four symb : Det -> N -> Str -> Str -> NP ; -- the levels i and j - symb : Det -> CN -> [Symb] -> NP -- the basic levels i, j, and k + symb : Det -> CN -> [Symb] -> NP ; -- the basic levels i, j, and k + symb : Symb -> S ; -- A + symb : Symb -> Card ; -- n + symb : Symb -> Ord -- n'th } ; mkSymb : Str -> Symb ; @@ -25,9 +28,9 @@ incomplete resource Symbolic = open Symbol, Grammar in { symb = overload { symb : Str -> NP = \s -> UsePN (SymbPN (mkSymb s)) ; - symb : Integer -> NP + symb : Int -> NP = \i -> UsePN (IntPN i) ; - symb : Floating -> NP + symb : Float -> NP = \i -> UsePN (FloatPN i) ; symb : N -> Digits -> NP = \c,i -> CNNumNP (UseN c) (NumDigits i) ; @@ -42,7 +45,10 @@ incomplete resource Symbolic = open Symbol, Grammar in { symb : Det -> N -> Str -> Str -> NP = \c,n,x,y -> CNSymbNP c (UseN n) (BaseSymb (mkSymb x) (mkSymb y)) ; symb : Det -> CN -> [Symb] -> NP - = CNSymbNP + = CNSymbNP ; + symb : Symb -> S = SymbS ; + symb : Symb -> Card = SymbNum ; + symb : Symb -> Ord = SymbOrd } ; mkSymb : Str -> Symb = \s -> {s = s ; lock_Symb = <>} ; diff --git a/next-lib/src/api/SymbolicCat.gf b/next-lib/src/api/SymbolicCat.gf index 4c19a02bc..f0a1b59e3 100644 --- a/next-lib/src/api/SymbolicCat.gf +++ b/next-lib/src/api/SymbolicCat.gf @@ -2,4 +2,4 @@ resource SymbolicCat = Symbolic with (Symbol = SymbolCat), - (Syntax = SyntaxCat) ; + (Grammar = GrammarCat) ; diff --git a/next-lib/src/api/SymbolicSpa.gf b/next-lib/src/api/SymbolicSpa.gf index ae44431f5..f284075d7 100644 --- a/next-lib/src/api/SymbolicSpa.gf +++ b/next-lib/src/api/SymbolicSpa.gf @@ -1,4 +1,4 @@ ---# -path=.:present:mathematical:prelude +--# -path=.:present:prelude resource SymbolicSpa = Symbolic with (Symbol = SymbolSpa), diff --git a/next-lib/src/api/SyntaxCat.gf b/next-lib/src/api/SyntaxCat.gf index 73ff4829c..e9223be44 100644 --- a/next-lib/src/api/SyntaxCat.gf +++ b/next-lib/src/api/SyntaxCat.gf @@ -1,4 +1,5 @@ ---# -path=.:alltenses:prelude +--# -path=.:alltenses -instance SyntaxCat of Syntax = ConstructorsCat, CatCat, StructuralCat, CombinatorsCat ; +instance SyntaxCat of Syntax = + ConstructorsCat, CatCat, StructuralCat, CombinatorsCat ; diff --git a/next-lib/src/api/SyntaxSpa.gf b/next-lib/src/api/SyntaxSpa.gf index 40315b430..6c36175d7 100644 --- a/next-lib/src/api/SyntaxSpa.gf +++ b/next-lib/src/api/SyntaxSpa.gf @@ -1,4 +1,4 @@ ---# -path=.:alltenses:prelude +--# -path=.:alltenses instance SyntaxSpa of Syntax = ConstructorsSpa, CatSpa, StructuralSpa, CombinatorsSpa ; |