GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-19 01:39:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

the lincat of Int simplified to SS again (Linear,Lookup,CheckGrammar by commenting out)

Browse Source
This commit is contained in:
aarne
2007-10-21 10:01:14 +00:00
parent 16f3df2311
commit 01bc4c138e
4 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GF/Compile/CheckGrammar.hs
View File

@@ -311,10 +311,10 @@ computeLType gr t = do
Q m c | elem c [cPredef,cPredefAbs] -> return ty
Q m c | elem c [zIdent "Int"] ->
let ints k = App (Q (IC "Predef") (IC "Ints")) (EInt k) in
return $
RecType [
(LIdent "s", typeStr), (LIdent "last",ints 9),(LIdent "size",ints 1)]
return $ defLinType
---- let ints k = App (Q (IC "Predef") (IC "Ints")) (EInt k) in
---- RecType [
---- (LIdent "last",ints 9),(LIdent "s", typeStr), (LIdent "size",ints 1)]
Q m c | elem c [zIdent "Float",zIdent "String"] -> return defLinType ----
Q m ident -> checkIn ("module" +++ prt m) $ do

6
src/GF/Grammar/Lookup.hs
View File

@@ -230,12 +230,14 @@ lookupAbsDef gr m c = errIn ("looking up absdef of" +++ prt c) $ do
lookupLincat :: SourceGrammar -> Ident -> Ident -> Err Type
{- ----
lookupLincat gr m c | elem c [zIdent "Int"] =
let ints k = App (Q (IC "Predef") (IC "Ints")) (EInt k) in
return $
RecType [
(LIdent "s", typeStr), (LIdent "last",ints 9),(LIdent "size",ints 1)]
lookupLincat gr m c | elem c [zIdent "String", zIdent "Float"] =
(LIdent "last",ints 9),(LIdent "s", typeStr),(LIdent "size",ints 1)]
-}
lookupLincat gr m c | elem c [zIdent "String", zIdent "Float", zIdent "Int"] =
return defLinType --- ad hoc; not needed?
lookupLincat gr m c = do

8
src/GF/UseGrammar/Linear.hs
View File

@@ -80,9 +80,11 @@ linearizeToRecord gr mk m = lin [] where
recS t = R [Ass (L (identC "s")) t] ----
recInt i = R [Ass (L (identC "s")) (tK $ show i),
Ass (L (identC "last")) (EInt (rem i 10)),
Ass (L (identC "size")) (EInt (if i > 9 then 1 else 0))]
recInt i = R [
----Ass (L (identC "last")) (EInt (rem i 10)),
Ass (L (identC "s")) (tK $ show i) ----,
----Ass (L (identC "size")) (EInt (if i > 9 then 1 else 0))
]
lookCat = return . errVal defLindef . look
---- should always be given in the module