From ab1420510859c3534d9ba7ff1e2ecbf3e317bc6c Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 6 Oct 2008 15:27:14 +0000 Subject: next-lib now compiles webalt ; removed subdir mathematical/ for simplicity --- next-lib/src/api/Symbolic.gf | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'next-lib/src/api/Symbolic.gf') 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 = <>} ; -- cgit v1.2.3