Merge pull request #10 from Frege/dev/1.0.3-snapshot

Dev/1.0.3 snapshot Fix Frege/try-frege#10
Frege · Mar 19, 2014 · b0272cd · b0272cd
2 parents 27ed276 + 90876fe
commit b0272cd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/frege-interpreter-core/pom.xml b/frege-interpreter-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>frege</groupId>
         <artifactId>frege-interpreter</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>frege-interpreter-core</artifactId>
     <packaging>jar</packaging>

diff --git 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

diff --git a/frege-interpreter-java-support/pom.xml b/frege-interpreter-java-support/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>frege</groupId>
     <artifactId>frege-interpreter</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>frege-interpreter-java-support</artifactId>
   <packaging>jar</packaging>

diff --git a/frege-script-engine/pom.xml b/frege-script-engine/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>frege</groupId>
     <artifactId>frege-interpreter</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
   <groupId>frege</groupId>
   <artifactId>frege-script-engine</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>frege</groupId>
   <artifactId>frege-interpreter</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>frege-interpreter</name>
   <url>https://github.com/Frege/frege-interpreter</url>
   <modules>