Merge pull request #9 from Frege/dev/1.0.2-snapshot

Upgrade Frege
Frege · Mar 9, 2014 · 92d0ac4 · 92d0ac4
2 parents 4d6c1bb + 363ce29
commit 92d0ac4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,49 +3,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>frege</groupId>
   <artifactId>frege-repl</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <packaging>jar</packaging>
   <name>frege-repl</name>
   <url>https://github.com/Frege/frege-repl</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.sourceDirectory>src/main/frege</project.build.sourceDirectory>
     <frege.plugin.version>1.0.5</frege.plugin.version>
-    <frege.scripting.version>1.0.2-SNAPSHOT</frege.scripting.version>
+    <frege.interpreter.version>1.0.2</frege.interpreter.version>
     <jline.version>2.10</jline.version>
     <ecj.version>4.2.2</ecj.version>
     <junit.version>4.11</junit.version>
   </properties>
   <build>
-    <pluginManagement>
-      <plugins>
-        <!--For Eclipse m2e -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <versionRange>[1.7,)</versionRange>
-                    <goals>
-                      <goal>run</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>com.theoryinpractise.frege</groupId>
@@ -140,7 +111,7 @@
     <dependency>
       <groupId>frege</groupId>
       <artifactId>frege-interpreter-core</artifactId>
-      <version>${frege.scripting.version}</version>
+      <version>${frege.interpreter.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/main/frege/frege/repl/FregeRepl.fr b/src/main/frege/frege/repl/FregeRepl.fr
@@ -311,9 +311,9 @@ helpGUI title content = do
 
 data FregeJavaProxy = pure native frege.interpreter.javasupport.FregeJavaProxy where
   native with frege.interpreter.javasupport.FregeJavaProxy.with ::
-    (Object -> Method -> ObjectArr -> ST s a) -> Class c -> IO c
+    (Object -> Method -> ObjectArray -> ST s a) -> Class c -> IO c
 
-showDesktop :: Object -> Method -> ObjectArr -> IO ()
+showDesktop :: Object -> Method -> ObjectArray -> IO ()
 showDesktop _ _ args = do
   event <- return $ asHyperlinkEvent $ args.elemAt 0
   d <- Desktop.getDesktop ()
@@ -324,6 +324,9 @@ showDesktop _ _ args = do
   when (event.getEventType == HyperlinkEvent_EventType.activated) navigate
 
 
+derive ArrayElement Object
+type ObjectArray = JArray Object
+
 fixHelpLink s | Just (Just relative : _)
                   <- s `match` #^\.\.(.*)$# = "http://try.frege-lang.org/doc/frege" ++ relative
 fixHelpLink s = s