jparsec: upgrade to 3.0

Author: Locke

org.coreasm.engine/pom.xml

@@ -119,7 +119,7 @@
 		<dependency>
 			<groupId>org.jparsec</groupId>
 			<artifactId>jparsec</artifactId>
-			<version>2.3</version>
+			<version>3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>concurrent</groupId>

org.coreasm.engine/src/org/coreasm/engine/interpreter/ScannerInfo.java

@@ -15,7 +15,7 @@
 
 import java.io.Serializable;
 
-import org.codehaus.jparsec.Token;
+import org.jparsec.Token;
 import org.coreasm.engine.Specification;
 import org.coreasm.engine.parser.CharacterPosition;
 import org.coreasm.engine.parser.Parser;

org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java

@@ -14,10 +14,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.codehaus.jparsec.OperatorTable;
-import org.codehaus.jparsec.Parser;
-import org.codehaus.jparsec.functors.Binary;
-import org.codehaus.jparsec.functors.Unary;
+import org.jparsec.OperatorTable;
+import org.jparsec.Parser;
+import org.jparsec.functors.Binary;
+import org.jparsec.functors.Unary;
 import org.coreasm.engine.ControlAPI;
 import org.coreasm.engine.EngineError;
 import org.coreasm.engine.interpreter.ASTNode;

org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java

@@ -24,8 +24,8 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.codehaus.jparsec.Parser;
-import org.codehaus.jparsec.Parsers;
+import org.jparsec.Parser;
+import org.jparsec.Parsers;
 import org.coreasm.compiler.interfaces.CompilerPlugin;
 import org.coreasm.compiler.plugins.kernel.CompilerKernelPlugin;
 import org.coreasm.engine.ControlAPI;

org.coreasm.engine/src/org/coreasm/engine/kernel/KernelServices.java

@@ -13,7 +13,7 @@
 
 package org.coreasm.engine.kernel;
 
-import org.codehaus.jparsec.Parser;
+import org.jparsec.Parser;
 
 import org.coreasm.engine.interpreter.Node;
 import org.coreasm.engine.plugin.PluginServiceInterface;

org.coreasm.engine/src/org/coreasm/engine/parser/GrammarProduction.java

@@ -19,7 +19,7 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 
-import org.codehaus.jparsec.Parser;
+import org.jparsec.Parser;
 import org.coreasm.engine.interpreter.Node;
 import org.coreasm.engine.parser.GrammarRule.GRType;
 import org.coreasm.util.CoreASMGlobal;

org.coreasm.engine/src/org/coreasm/engine/parser/GrammarRule.java

@@ -15,10 +15,10 @@
 
 import org.coreasm.engine.interpreter.Node;
 
-import org.codehaus.jparsec.Parser;
+import org.jparsec.Parser;
 
 /** 
- * A structure to hold a grammar rule, and a {@link jfun.parsec.Parser} instance
+ * A structure to hold a grammar rule, and a {@link org.jparsec.Parser} instance
  * for that grammar rule.
  *   
  * @author Roozbeh Farahbod

org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java

@@ -57,7 +57,7 @@ public class JParsecParser implements Parser {
 	private boolean headerParsed = false;
 
 	/** the actual parser -- a JParsec parser */ 
-	private org.codehaus.jparsec.Parser<Node> parser;
+	private org.jparsec.Parser<Node> parser;
 
 	/** the root grammar rule */
 	private GrammarRule rootGrammarRule;
@@ -167,11 +167,11 @@ public void parseSpecification() throws ParserException {
 				this.rootGrammarRule = ((ParserPlugin)kernel).getParsers().get("CoreASM");
 				this.parser = rootGrammarRule.parser;
 				try {
-					org.codehaus.jparsec.Parser<Node> _parser =  parser.from(parserTools.getTokenizer(), parserTools.getIgnored());
+					org.jparsec.Parser<Node> _parser =  parser.from(parserTools.getTokenizer(), parserTools.getIgnored());
 					rootNode = (ASTNode) _parser.parse(specification.getText());
 				} catch (Throwable e) {
-					if (e instanceof org.codehaus.jparsec.error.ParserException) {
-						org.codehaus.jparsec.error.ParserException pe = (org.codehaus.jparsec.error.ParserException) e;
+					if (e instanceof org.jparsec.error.ParserException) {
+						org.jparsec.error.ParserException pe = (org.jparsec.error.ParserException) e;
 						Throwable cause = pe.getCause();
 						String msg = pe.getMessage();
 						msg = msg.substring(msg.indexOf("\n")+1);

org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java

@@ -15,7 +15,7 @@
 
 import org.coreasm.engine.plugin.Plugin;
 
-import org.codehaus.jparsec.functors.Map;
+import org.jparsec.functors.Map;
 
 /** 
  * Specialized version of {@link Map} that gets a plug-in name as well. 

org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java

@@ -3,7 +3,7 @@
 import org.coreasm.engine.interpreter.Node;
 import org.coreasm.engine.plugin.Plugin;
 
-import org.codehaus.jparsec.functors.Map2;
+import org.jparsec.functors.Map2;
 
 /** 
  * Specialized version of {@link Map3} that gets a plug-in name as well.