diff options
| author | aarne <unknown> | 2005-06-26 19:40:31 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-06-26 19:40:31 +0000 |
| commit | b9e13711db0085b25e9257d1034b43a3a2c47b7e (patch) | |
| tree | 1c107ae9536d56e43c9e9c3891066cd4c04aec63 /src | |
| parent | 5d6bb705e66343a030ba242175a031e839be2aee (diff) | |
Finnish close to production ; Predef.occurs
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/MkConcrete.hs | 4 | ||||
| -rw-r--r-- | src/GF/Grammar/AppPredefined.hs | 8 | ||||
| -rw-r--r-- | src/Makefile | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/GF/Compile/MkConcrete.hs b/src/GF/Compile/MkConcrete.hs index 7d228de39..d96e3e774 100644 --- a/src/GF/Compile/MkConcrete.hs +++ b/src/GF/Compile/MkConcrete.hs @@ -63,8 +63,8 @@ mkCncGroups (res,files) = do putStrLnFlush $ "Going to preprocess examples in " ++ unwords files putStrLn $ "Compiling resource " ++ res egr <- appIOE $ - optFile2grammar (options - [useOptimizer "share",fromSource,beSilent,notEmitCode]) res --- for -mcfg + optFile2grammar (options [beSilent]) res + -- [useOptimizer "share",fromSource,beSilent,notEmitCode]) res --- for -mcfg gr <- err (\s -> putStrLn s >> error "resource file rejected") return egr let parser cat = errVal ([],"No parse") . optParseArgErrMsg (options [newMParser, firstCat cat, beVerbose]) gr diff --git a/src/GF/Grammar/AppPredefined.hs b/src/GF/Grammar/AppPredefined.hs index 1ec023a63..da81c0d83 100644 --- a/src/GF/Grammar/AppPredefined.hs +++ b/src/GF/Grammar/AppPredefined.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:22:19 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.11 $ +-- > CVS $Date: 2005/06/26 20:40:33 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.12 $ -- -- Predefined function type signatures and definitions. ----------------------------------------------------------------------------- @@ -41,6 +41,7 @@ typPredefined c@(IC f) = case f of "eqStr" -> return $ mkFunType [typeTok,typeTok] (cnPredef "PBool") "length" -> return $ mkFunType [typeTok] (cnPredef "Int") "occur" -> return $ mkFunType [typeTok,typeTok] (cnPredef "PBool") + "occurs" -> return $ mkFunType [typeTok,typeTok] (cnPredef "PBool") "plus" -> return $ mkFunType [cnPredef "Int",cnPredef "Int"] (cnPredef "Int") ---- "read" -> (P : Type) -> Tok -> P "show" -> return $ mkProd -- (P : PType) -> P -> Tok @@ -77,6 +78,7 @@ appPredefined t = case t of ("dp", EInt i, K s) -> retb $ K (drop (max 0 (length s - i)) s) ("eqStr",K s, K t) -> retb $ if s == t then predefTrue else predefFalse ("occur",K s, K t) -> retb $ if substring s t then predefTrue else predefFalse + ("occurs",K s, K t) -> retb $ if any (flip elem t) s then predefTrue else predefFalse ("eqInt",EInt i, EInt j) -> retb $ if i==j then predefTrue else predefFalse ("lessInt",EInt i, EInt j) -> retb $ if i<j then predefTrue else predefFalse ("plus", EInt i, EInt j) -> retb $ EInt $ i+j diff --git a/src/Makefile b/src/Makefile index 52bff9a33..9a5c4db7f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -113,9 +113,8 @@ today: tools/mktoday.sh $(PACKAGE_VERSION) javac: - $(JAVAC) $(JAVAFLAGS) JavaGUI/*.java $(JAVAC) $(JAVAFLAGS) -classpath $(GFEDITOR):$(GFEDITOR)/log4j-1.2.8.jar:$(GFEDITOR)/jargs-1.0.jar $(GFEDITOR)/de/uka/ilkd/key/ocl/gf/*.java - + $(JAVAC) $(JAVAFLAGS) JavaGUI/*.java jar: javac cd JavaGUI; $(JAR) -cmf manifest.txt gf-java.jar *.class ; cd .. |