Merge pull request #3 from pgleeson/master

borismarin · web-flow · commit c2332477dcf5 · 2017-02-07T14:42:41.000-02:00
Travis now working
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: java
 
 before_install:
-  - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
-
+    # Temp workaround to remove old references to codehaus repos
+  - rm ~/.m2/settings.xml
 jdk:
   - openjdk7
   - oraclejdk7
diff --git a/pom.xml b/pom.xml
@@ -16,9 +16,9 @@
 			<url>http://dl.bintray.com/unitsofmeasurement/maven</url>
 		</repository>
 	</repositories>
-	<groupId>expr_parser</groupId>
-	<artifactId>expr_parser</artifactId>
-	<version>0.0.1</version>
+	<groupId>org.lemsml.expr-parser</groupId>
+	<artifactId>org.lemsml.expr-parser</artifactId>
+	<version>0.0.3</version>
 	<packaging>jar</packaging>
 	<dependencies>
 		<dependency>
@@ -98,7 +98,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.2.1</version>
+				<version>1.5.0</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/src/main/java/org/lemsml/expr_parser/utils/DirectedGraph.java b/src/main/java/org/lemsml/expr_parser/utils/DirectedGraph.java
@@ -1,4 +1,4 @@
-package expr_parser.utils;
+package org.lemsml.expr_parser.utils;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/org/lemsml/expr_parser/utils/ExpressionParser.java b/src/main/java/org/lemsml/expr_parser/utils/ExpressionParser.java
@@ -1,4 +1,4 @@
-package expr_parser.utils;
+package org.lemsml.expr_parser.utils;
 
 import java.util.Map;
 import java.util.Set;
@@ -8,12 +8,12 @@
 
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
-import expr_parser.visitors.AntlrExpressionParser;
-import expr_parser.visitors.ContextEvalVisitor;
-import expr_parser.visitors.DimensionalAnalysisVisitor;
-import expr_parser.visitors.ListVariablesInExprVisitor;
-import expr_parser.visitors.QuantityConditionalEvalVisitor;
-import expr_parser.visitors.QuantityEvalVisitor;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.ContextEvalVisitor;
+import org.lemsml.expr_parser.visitors.DimensionalAnalysisVisitor;
+import org.lemsml.expr_parser.visitors.ListVariablesInExprVisitor;
+import org.lemsml.expr_parser.visitors.QuantityConditionalEvalVisitor;
+import org.lemsml.expr_parser.visitors.QuantityEvalVisitor;
 
 public class ExpressionParser {
 
diff --git a/src/main/java/org/lemsml/expr_parser/utils/SymbolExpander.java b/src/main/java/org/lemsml/expr_parser/utils/SymbolExpander.java
@@ -1,11 +1,11 @@
-package expr_parser.utils;
+package org.lemsml.expr_parser.utils;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import expr_parser.visitors.AntlrExpressionParser;
-import expr_parser.visitors.ExpandSymbols;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.ExpandSymbols;
 
 public class SymbolExpander {
 	public static final LinkedHashMap<String, String> expandSymbols(
diff --git a/src/main/java/org/lemsml/expr_parser/utils/TextUtils.java b/src/main/java/org/lemsml/expr_parser/utils/TextUtils.java
@@ -1,4 +1,4 @@
-package expr_parser.utils;
+package org.lemsml.expr_parser.utils;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/org/lemsml/expr_parser/utils/TopologicalSort.java b/src/main/java/org/lemsml/expr_parser/utils/TopologicalSort.java
@@ -1,4 +1,4 @@
-package expr_parser.utils;
+package org.lemsml.expr_parser.utils;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/main/java/org/lemsml/expr_parser/utils/UndefinedSymbolException.java b/src/main/java/org/lemsml/expr_parser/utils/UndefinedSymbolException.java
@@ -1,4 +1,4 @@
-package expr_parser.utils;
+package org.lemsml.expr_parser.utils;
 
 public class UndefinedSymbolException extends Exception {
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/ARenderAs.java b/src/main/java/org/lemsml/expr_parser/visitors/ARenderAs.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import org.antlr.v4.runtime.Token;
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/AntlrExpressionParser.java b/src/main/java/org/lemsml/expr_parser/visitors/AntlrExpressionParser.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/BooleanOrQuantity.java b/src/main/java/org/lemsml/expr_parser/visitors/BooleanOrQuantity.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import javax.measure.Quantity;
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/ComparisonEvalVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/ComparisonEvalVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import parser.LEMSExpressionParser;
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/ContextEvalVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/ContextEvalVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/DimensionalAnalysisVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/DimensionalAnalysisVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import static tec.units.ri.AbstractUnit.ONE;
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/EvalVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/EvalVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import parser.LEMSExpressionBaseVisitor;
 import parser.LEMSExpressionParser;
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/ExpandSymbols.java b/src/main/java/org/lemsml/expr_parser/visitors/ExpandSymbols.java
@@ -1,10 +1,10 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import java.util.Map;
 
 import parser.LEMSExpressionBaseVisitor;
 import parser.LEMSExpressionParser;
-import expr_parser.utils.TextUtils;
+import org.lemsml.expr_parser.utils.TextUtils;
 
 public class ExpandSymbols extends LEMSExpressionBaseVisitor<String> {
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/ListVariablesInExprVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/ListVariablesInExprVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/QuantityConditionalEvalVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/QuantityConditionalEvalVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import static tec.units.ri.AbstractUnit.ONE;
 
@@ -14,7 +14,7 @@
 
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
-import expr_parser.utils.UndefinedSymbolException;
+import org.lemsml.expr_parser.utils.UndefinedSymbolException;
 import parser.LEMSExpressionBaseVisitor;
 import parser.LEMSExpressionParser;
 import tec.units.ri.quantity.Quantities;
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/QuantityEvalVisitor.java b/src/main/java/org/lemsml/expr_parser/visitors/QuantityEvalVisitor.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import static tec.units.ri.AbstractUnit.ONE;
 
@@ -14,7 +14,7 @@
 
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
-import expr_parser.utils.UndefinedSymbolException;
+import org.lemsml.expr_parser.utils.UndefinedSymbolException;
 import parser.LEMSExpressionBaseVisitor;
 import parser.LEMSExpressionParser;
 import tec.units.ri.quantity.Quantities;
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/RenderC.java b/src/main/java/org/lemsml/expr_parser/visitors/RenderC.java
@@ -1,11 +1,11 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
 import parser.LEMSExpressionLexer;
 import parser.LEMSExpressionParser;
-import expr_parser.utils.TextUtils;
+import org.lemsml.expr_parser.utils.TextUtils;
 
 public class RenderC extends ARenderAs {
 	@Override
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/RenderJava.java b/src/main/java/org/lemsml/expr_parser/visitors/RenderJava.java
@@ -1,11 +1,11 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
 import parser.LEMSExpressionLexer;
 import parser.LEMSExpressionParser;
-import expr_parser.utils.TextUtils;
+import org.lemsml.expr_parser.utils.TextUtils;
 
 public class RenderJava extends ARenderAs {
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/RenderLatex.java b/src/main/java/org/lemsml/expr_parser/visitors/RenderLatex.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import java.util.Arrays;
 import java.util.List;
@@ -8,7 +8,7 @@
 
 import parser.LEMSExpressionLexer;
 import parser.LEMSExpressionParser;
-import expr_parser.utils.TextUtils;
+import org.lemsml.expr_parser.utils.TextUtils;
 
 public class RenderLatex extends ARenderAs {
 	@Override
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/RenderMathJS.java b/src/main/java/org/lemsml/expr_parser/visitors/RenderMathJS.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 import java.util.Map;
 
@@ -12,7 +12,7 @@
 
 import parser.LEMSExpressionLexer;
 import parser.LEMSExpressionParser;
-import expr_parser.utils.TextUtils;
+import org.lemsml.expr_parser.utils.TextUtils;
 
 public class RenderMathJS extends ARenderAs {
 
diff --git a/src/main/java/org/lemsml/expr_parser/visitors/Value.java b/src/main/java/org/lemsml/expr_parser/visitors/Value.java
@@ -1,4 +1,4 @@
-package expr_parser.visitors;
+package org.lemsml.expr_parser.visitors;
 
 public class Value {
 	public static Value VOID = new Value(new Object());
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/ComparisonVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/ComparisonVisitorTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -8,9 +8,9 @@
 
 import org.junit.Test;
 
-import expr_parser.visitors.AntlrExpressionParser;
-import expr_parser.visitors.ComparisonEvalVisitor;
-import expr_parser.visitors.ContextEvalVisitor;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.ComparisonEvalVisitor;
+import org.lemsml.expr_parser.visitors.ContextEvalVisitor;
 
 public class ComparisonVisitorTest {
 
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/ContextEvalVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/ContextEvalVisitorTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -11,9 +11,9 @@
 
 import org.junit.Test;
 
-import expr_parser.utils.DirectedGraph;
-import expr_parser.utils.ExpressionParser;
-import expr_parser.utils.TopologicalSort;
+import org.lemsml.expr_parser.utils.DirectedGraph;
+import org.lemsml.expr_parser.utils.ExpressionParser;
+import org.lemsml.expr_parser.utils.TopologicalSort;
 
 public class ContextEvalVisitorTest {
 
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/DimensionalAnalysisVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/DimensionalAnalysisVisitorTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -15,7 +15,7 @@
 
 import org.junit.Test;
 
-import expr_parser.utils.ExpressionParser;
+import org.lemsml.expr_parser.utils.ExpressionParser;
 
 public class DimensionalAnalysisVisitorTest {
 
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/DimensionalComparisonVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/DimensionalComparisonVisitorTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -15,8 +15,8 @@
 import org.junit.Test;
 
 import tec.units.ri.quantity.Quantities;
-import expr_parser.visitors.AntlrExpressionParser;
-import expr_parser.visitors.QuantityConditionalEvalVisitor;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.QuantityConditionalEvalVisitor;
 
 public class DimensionalComparisonVisitorTest {
 
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/EvalVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/EvalVisitorTest.java
@@ -1,11 +1,11 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import expr_parser.visitors.AntlrExpressionParser;
-import expr_parser.visitors.EvalVisitor;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.EvalVisitor;
 
 public class EvalVisitorTest {
 	private static final double EPSILON = 1e-10d;
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/ListVariablesInExprVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/ListVariablesInExprVisitorTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -9,8 +9,8 @@
 
 import org.junit.Test;
 
-import expr_parser.visitors.AntlrExpressionParser;
-import expr_parser.visitors.ListVariablesInExprVisitor;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.ListVariablesInExprVisitor;
 
 public class ListVariablesInExprVisitorTest {
 
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/QuantityEvalVisitorTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/QuantityEvalVisitorTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertEquals;
 import static tec.units.ri.AbstractUnit.ONE;
@@ -22,8 +22,8 @@
 import org.junit.rules.ExpectedException;
 
 import tec.units.ri.quantity.Quantities;
-import expr_parser.utils.ExpressionParser;
-import expr_parser.utils.UndefinedSymbolException;
+import org.lemsml.expr_parser.utils.ExpressionParser;
+import org.lemsml.expr_parser.utils.UndefinedSymbolException;
 
 public class QuantityEvalVisitorTest {
 	@Rule
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/RenderExpressionAsLangTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/RenderExpressionAsLangTest.java
@@ -1,4 +1,4 @@
-package expr_parser.parser.test;
+package org.lemsml.expr_parser.parser.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,11 +7,11 @@
 
 import org.junit.Test;
 
-import expr_parser.visitors.ARenderAs;
-import expr_parser.visitors.RenderC;
-import expr_parser.visitors.RenderJava;
-import expr_parser.visitors.RenderLatex;
-import expr_parser.visitors.AntlrExpressionParser;
+import org.lemsml.expr_parser.visitors.ARenderAs;
+import org.lemsml.expr_parser.visitors.RenderC;
+import org.lemsml.expr_parser.visitors.RenderJava;
+import org.lemsml.expr_parser.visitors.RenderLatex;
+import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
 
 public class RenderExpressionAsLangTest {
 
diff --git a/src/test/java/org/lemsml/expr_parser/parser/test/TernaryTest.java b/src/test/java/org/lemsml/expr_parser/parser/test/TernaryTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package expr_parser.utils;`
	`1`	`+package org.lemsml.expr_parser.utils;`
`2`	`2`
`3`	`3`	`import java.util.Collection;`
`4`	`4`	`import java.util.Collections;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package expr_parser.visitors;`
	`1`	`+package org.lemsml.expr_parser.visitors;`
`2`	`2`
`3`	`3`	`import org.antlr.v4.runtime.Token;`
`4`	`4`