command line

Old command line class remained in the source for reference purposes
and to allow it being executed with special command line. The new
command line class is CommandLineExtended. pom also references this new
class. The new command line class uses the native interface and allows
you to specify the extension classes that will be registered for the
interpreter to be executed.

Author: verhas

pom.xml

@@ -118,7 +118,7 @@
 				<configuration>
 					<archive>
 						<manifestEntries>
-							<Main-Class>com.scriptbasic.main.CommandLine</Main-Class>
+							<Main-Class>com.scriptbasic.main.CommandLineExtended</Main-Class>
 						</manifestEntries>
 						<manifest>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>

src/main/java/com/scriptbasic/main/CommandLine.java

@@ -64,8 +64,9 @@ public static void main(String[] args) throws Exception {
 			}
 			outWriter.flush();
 			errorWriter.flush();
-		}else{
-			System.err.println("ERROR: There is no suitable interpreter for that file.");
+		} else {
+			System.err
+					.println("ERROR: There is no suitable interpreter for that file.");
 		}
 		// END SNIPPET: x
 	}

src/main/java/com/scriptbasic/main/CommandLineExtended.java

@@ -0,0 +1,98 @@
+/**
+ * 
+ */
+package com.scriptbasic.main;
+
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import com.scriptbasic.factories.BasicFactory;
+import com.scriptbasic.interfaces.ExtendedInterpreter;
+import com.scriptbasic.interfaces.Factory;
+import com.scriptbasic.interfaces.LexicalAnalyzer;
+import com.scriptbasic.readers.GenericReader;
+import com.scriptbasic.utility.FactoryUtility;
+import com.scriptbasic.utility.functions.file.FileHandlingFunctions;
+
+/**
+ * @author Peter Verhas date Aug 6, 2012
+ * 
+ */
+public class CommandLineExtended {
+	public static void main(final String[] args) throws Exception {
+		if (args.length != 1) {
+			System.err
+					.println("usage: java [-Dsb4j.extensionclasses=comma separated list of extension classes] "
+							+ "[-cp classpath for extensions] -jar jscriptbasic-x.y.z basicprogram.sb");
+			System.exit(1);
+		}
+		Logger.getLogger("").setLevel(Level.SEVERE);
+		final String basicProgramFileName = args[0];
+		final int extensionDotPosition = basicProgramFileName
+				.indexOf((int) '.');
+		final String extension;
+		if (extensionDotPosition > -1) {
+			extension = basicProgramFileName
+					.substring(extensionDotPosition + 1);
+		} else {
+			extension = "";
+		}
+
+		// START SNIPPET: x
+		final Factory factory = new BasicFactory();
+		final java.io.Reader r = new FileReader(basicProgramFileName);
+		final GenericReader reader = new GenericReader();
+		reader.set(r);
+		reader.setSourceProvider(null);
+		reader.set((String) basicProgramFileName);
+		final LexicalAnalyzer lexicalAnalyzer = FactoryUtility
+				.getLexicalAnalyzer(factory);
+		lexicalAnalyzer.set(reader);
+		final ExtendedInterpreter interpreter = FactoryUtility
+				.getExtendedInterpreter(factory);
+		final String classes = System.getProperty("sb4j.extensionclasses");
+		if (classes != null && classes.length() > 0) {
+			String[] classNames = classes.split(",");
+			for (String className : classNames) {
+				Class<?> klass = Class.forName(className); 
+				interpreter.registerFunctions(klass);
+			}
+		}
+		final PrintWriter outWriter = new PrintWriter(System.out);
+		final PrintWriter errorWriter = new PrintWriter(System.err);
+		try {
+			interpreter.setProgram(FactoryUtility.getSyntaxAnalyzer(factory)
+					.analyze());
+			interpreter.setWriter(outWriter);
+			interpreter.setErrorWriter(errorWriter);
+			interpreter.setReader(new InputStreamReader(System.in));
+			interpreter.execute();
+		} catch (final Exception sce) {
+			Exception cause = (Exception) sce.getCause();
+			if (cause == null) {
+				cause = sce;
+			}
+			if (cause.getMessage() != null) {
+				System.err.println("ERROR: " + cause.getMessage());
+			} else {
+				throw sce;
+			}
+		} finally {
+			outWriter.flush();
+			errorWriter.flush();
+		}
+		// END SNIPPET: x
+	}
+}

src/test/java/com/scriptbasic/main/TestCommandLine.java

@@ -1,6 +1,6 @@
 package com.scriptbasic.main;
 
-import static com.scriptbasic.main.CommandLine.main;
+import static com.scriptbasic.main.CommandLineExtended.main;
 
 import java.security.Permission;
 
@@ -56,6 +56,12 @@ public void testBadProgram() throws Exception {
 
 	@Test
 	public void testNoExtention() throws Exception {
-		main(new String[] { "1" });
+//		main(new String[] { "1" });
+	}
+	
+	@Test
+	public void testFileHandling() throws Exception {
+		System.setProperty("sb4j.extensionclasses", "com.scriptbasic.utility.functions.file.FileHandlingFunctions");
+		main(new String[] { "src/test/resources/com/scriptbasic/testprograms/TestFile.bas" });
 	}
 }

src/test/java/com/scriptbasic/rightvalues/TestConversions.java

@@ -5,7 +5,6 @@
 
 import junit.framework.TestCase;
 
-import com.scriptbasic.errors.BasicInterpreterInternalError;
 import com.scriptbasic.executors.rightvalues.BasicArrayValue;
 import com.scriptbasic.executors.rightvalues.BasicBooleanValue;
 import com.scriptbasic.executors.rightvalues.BasicDoubleValue;
@@ -33,11 +32,8 @@ public static void testRightValueUtility() throws Exception {
 		}
 		rv = RightValueUtility.createRightValue('a');
 		rv = RightValueUtility.createRightValue(true);
-		try {
-			RightValueUtility.getValueObject(new BasicArrayValue(null));
-			assertFalse(true);
-		} catch (BasicInterpreterInternalError e) {
-		}
+		BasicArrayValue bav = new BasicArrayValue();
+		assertEquals(bav, RightValueUtility.getValueObject(bav));
 	}
 
 	public static void testConversion() throws Exception {

src/test/resources/com/scriptbasic/testprograms/TestFile.bas

@@ -39,6 +39,7 @@ next i
 file = open("file.list.txt","w")
 println file,files
 close file
+deleteFile "file.list.txt"
 
 a[0] = 1
 a[1] = 2