From 8ea645133f71e88ecedc0fd70ab13aa3c0ef9f6f Mon Sep 17 00:00:00 2001 From: mmhelloworld Date: Tue, 18 Mar 2014 03:05:03 -0400 Subject: [PATCH 1/2] Set new version --- frege-interpreter-core/pom.xml | 2 +- frege-interpreter-java-support/pom.xml | 2 +- frege-script-engine/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frege-interpreter-core/pom.xml b/frege-interpreter-core/pom.xml index 8aeaaf2..d6176c9 100644 --- a/frege-interpreter-core/pom.xml +++ b/frege-interpreter-core/pom.xml @@ -6,7 +6,7 @@ frege frege-interpreter - 1.0.2 + 1.0.3-SNAPSHOT frege-interpreter-core jar diff --git a/frege-interpreter-java-support/pom.xml b/frege-interpreter-java-support/pom.xml index a2a0aa3..74b42eb 100644 --- a/frege-interpreter-java-support/pom.xml +++ b/frege-interpreter-java-support/pom.xml @@ -4,7 +4,7 @@ frege frege-interpreter - 1.0.2 + 1.0.3-SNAPSHOT frege-interpreter-java-support jar diff --git a/frege-script-engine/pom.xml b/frege-script-engine/pom.xml index f3ade00..48b2969 100644 --- a/frege-script-engine/pom.xml +++ b/frege-script-engine/pom.xml @@ -6,7 +6,7 @@ frege frege-interpreter - 1.0.2 + 1.0.3-SNAPSHOT frege frege-script-engine diff --git a/pom.xml b/pom.xml index 9bf054a..b401267 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ frege frege-interpreter pom - 1.0.2 + 1.0.3-SNAPSHOT frege-interpreter https://github.com/Frege/frege-interpreter From 90876feed49b8a4db373e8cd61c15b9ac655b3d1 Mon Sep 17 00:00:00 2001 From: mmhelloworld Date: Wed, 19 Mar 2014 00:43:05 -0400 Subject: [PATCH 2/2] Fix Frege/try-frege#10 --- .../main/frege/frege/interpreter/FregeInterpreter.fr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frege-interpreter-core/src/main/frege/frege/interpreter/FregeInterpreter.fr b/frege-interpreter-core/src/main/frege/frege/interpreter/FregeInterpreter.fr index 00f326d..d7ff90f 100644 --- a/frege-interpreter-core/src/main/frege/frege/interpreter/FregeInterpreter.fr +++ b/frege-interpreter-core/src/main/frege/frege/interpreter/FregeInterpreter.fr @@ -263,7 +263,7 @@ data Message = Message {pos :: Position, msgType :: MessageType, text :: String} error txt = Message Position.null ERROR txt hint txt = Message Position.null HINT txt warning txt = Message Position.null WARNING txt - fromGlobal (g :: Global) = map fromCompilerMessage g.sub.messages + fromGlobal (g :: Global) = reverse $ map fromCompilerMessage g.sub.messages instance Show Message where show (Message pos INFO txt) = txt @@ -358,7 +358,7 @@ findScriptType src = fst $ StG.run f (interpreterCompilerEnv InterpreterClassLoa scriptTypePass src = do g <- getST - let tokens = filter noComment g.sub.toks.toList + let tokens = filter noDocComment g.sub.toks.toList case tokens of [] -> return SourceType.ModuleSource (Token{tokid=PACKAGE}) : _ -> return SourceType.ModuleSource @@ -368,7 +368,7 @@ scriptTypePass src = do then return SourceType.ExpressionSource else return SourceType.DefinitionsSource -noComment Token{tokid} = tokid != COMMENT && tokid != DOCUMENTATION +noDocComment Token{tokid} = tokid != COMMENT && tokid != DOCUMENTATION moduleDeclScript moduleName = "module " ++ moduleName ++ " where" variableDeclScript varName script = varName ++ " = \n" ++ (indent 2 script) @@ -561,7 +561,7 @@ getSymbols tab = (sortBy positionAndName • filter wanted • values) tab iparsePass f = do g <- getST - let tokens = (filter noComment g.sub.toks.toList) + let tokens = filter Token.noComment g.sub.toks.toList result <- Parse.pass tokens case result of Just (GUtil.Program.Module (packname, defs, doc)) -> do @@ -589,7 +589,7 @@ expressionPass src = do if g.errors != 0 then return false else do - let tokens = filter noComment g.sub.toks.toList + let tokens = filter noDocComment g.sub.toks.toList result <- Parse.pass tokens g <- getST return $ g.errors == 0