From 363ce29eba97d4480464044e8dad31e884a9f43a Mon Sep 17 00:00:00 2001 From: mmhelloworld Date: Sun, 9 Mar 2014 03:13:03 -0400 Subject: [PATCH] Upgrade Frege --- pom.xml | 35 +++----------------------- src/main/frege/frege/repl/FregeRepl.fr | 7 ++++-- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 8e5731f..8d26963 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 frege frege-repl - 1.0.2-SNAPSHOT + 1.0.2 jar frege-repl https://github.com/Frege/frege-repl @@ -11,41 +11,12 @@ UTF-8 src/main/frege 1.0.5 - 1.0.2-SNAPSHOT + 1.0.2 2.10 4.2.2 4.11 - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-antrun-plugin - [1.7,) - - run - - - - - - - - - - - - com.theoryinpractise.frege @@ -140,7 +111,7 @@ frege frege-interpreter-core - ${frege.scripting.version} + ${frege.interpreter.version} diff --git a/src/main/frege/frege/repl/FregeRepl.fr b/src/main/frege/frege/repl/FregeRepl.fr index 4145b3c..c027f92 100644 --- 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