GraalVM: added catch Error in ttop and removed it from graal demo

jline · May 5, 2020 · 6643730 · 6643730
1 parent c5eca10
commit 6643730
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/TTop.java b/builtins/src/main/java/org/jline/builtins/TTop.java
@@ -229,6 +229,9 @@ public void run() throws IOException, InterruptedException {
             } while (op != Operation.EXIT);
         } catch (InterruptedException ie) {
             // Do nothing
+        } catch (Error err) {
+            Log.info("Error: ", err);
+            return;
         } finally {
             terminal.setAttributes(attr);
             if (prevHandler != null) {

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -104,7 +104,6 @@
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
-            <version>19.3.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -198,7 +197,6 @@
             <plugin>
                 <groupId>org.graalvm.nativeimage</groupId>
                 <artifactId>native-image-maven-plugin</artifactId>
-                <version>19.3.1</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/demo/src/main/java/org/jline/demo/Graal.java b/demo/src/main/java/org/jline/demo/Graal.java
@@ -20,6 +20,7 @@
 import java.util.stream.Collectors;
 
 import org.jline.builtins.*;
+import org.jline.builtins.Builtins.Command;
 import org.jline.builtins.Completers.OptionCompleter;
 import org.jline.builtins.Widgets.TailTipWidgets;
 import org.jline.builtins.Widgets.TailTipWidgets.TipType;
@@ -243,12 +244,14 @@ public static void main(String[] args) {
             Thread executeThread = Thread.currentThread();
             terminal.handle(Signal.INT, signal -> executeThread.interrupt());
             //
-            // ScriptEngine and command registeries
+            // Command registeries
             //
             File file = new File(Graal.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
             String root = file.getCanonicalPath().replace("graal", "").replaceAll("\\\\", "/"); // forward slashes works better also in windows!
             ConfigurationPath configPath = new ConfigurationPath(Paths.get(root), Paths.get(root));
-            Builtins builtins = new Builtins(Graal::workDir, configPath, null);
+            Set<Builtins.Command> commands = new HashSet<>(Arrays.asList(Builtins.Command.values()));
+            commands.remove(Command.TTOP);                          // ttop command is not supported in GraalVM
+            Builtins builtins = new Builtins(commands, Graal::workDir, configPath, null);
             MyCommands myCommands = new MyCommands(Graal::workDir);
             SystemRegistryImpl systemRegistry = new SystemRegistryImpl(parser, terminal, Graal::workDir, configPath);
             systemRegistry.setCommandRegistries(builtins, myCommands);
@@ -285,7 +288,7 @@ public static void main(String[] args) {
             //
             // REPL-loop
             //
-            System.out.println(terminal.getName()+": "+terminal.getType());
+            System.out.println(terminal.getName() + ": " + terminal.getType());
             while (true) {
                 try {
                     systemRegistry.cleanUp();         // delete temporary variables and reset output streams

diff --git a/pom.xml b/pom.xml
@@ -90,6 +90,8 @@
         <findbugs.version>3.0.2</findbugs.version>
         <groovy.version>3.0.3</groovy.version>
         <ivy.version>2.5.0</ivy.version>
+        <graal.version>19.3.1</graal.version>
+
         <surefire.argLine />
     </properties>
 
@@ -244,12 +246,18 @@
                 <artifactId>groovy-console</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.graalvm.sdk</groupId>
+                <artifactId>graal-sdk</artifactId>
+                <version>${graal.version}</version>
+            </dependency>
 
-	        <dependency>
-	            <groupId>org.apache.ivy</groupId>
-	            <artifactId>ivy</artifactId>
-	             <version>${ivy.version}</version>
-	        </dependency>        
+            <dependency>
+                <groupId>org.apache.ivy</groupId>
+                <artifactId>ivy</artifactId>
+                 <version>${ivy.version}</version>
+            </dependency>        
 
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -519,6 +527,11 @@
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.graalvm.nativeimage</groupId>
+                <artifactId>native-image-maven-plugin</artifactId>
+                <version>${graal.version}</version>
+            </plugin>            
         </plugins>
     </build>