Skip to content

Commit 2834823

Browse files
pgleesonpgleeson
authored
Merge pull request #4 from pgleeson/master
To v0.0.4; Renaming to org.lemsml.exprparser to avoid problems with name being expr-parser and package being expr_parser
2 parents c233247 + b10864d commit 2834823

33 files changed

Lines changed: 178 additions & 111 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# expr-parser
1+
# exprparser
22

33
--------------------------
44
[![Build

‎pom.xml‎

Lines changed: 104 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,58 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<repositories>
6-
<repository>
7-
<id>jitpack.io</id>
8-
<url>https://jitpack.io</url>
9-
</repository>
10-
<repository>
11-
<snapshots>
12-
<enabled>false</enabled>
13-
</snapshots>
14-
<id>bintray-unitsofmeasurement-maven</id>
15-
<name>bintray</name>
16-
<url>http://dl.bintray.com/unitsofmeasurement/maven</url>
17-
</repository>
18-
</repositories>
19-
<groupId>org.lemsml.expr-parser</groupId>
20-
<artifactId>org.lemsml.expr-parser</artifactId>
21-
<version>0.0.3</version>
22-
<packaging>jar</packaging>
5+
<groupId>org.lemsml.exprparser</groupId>
6+
<artifactId>org.lemsml.exprparser</artifactId>
7+
<version>0.0.4</version>
8+
<packaging>bundle</packaging>
9+
<properties>
10+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
</properties>
2312
<dependencies>
2413
<dependency>
2514
<groupId>org.antlr</groupId>
26-
<artifactId>antlr4-maven-plugin</artifactId>
27-
<version>4.3</version>
15+
<artifactId>antlr4-runtime</artifactId>
16+
<version>4.7</version>
2817
</dependency>
2918
<dependency>
3019
<groupId>junit</groupId>
3120
<artifactId>junit</artifactId>
3221
<version>4.11</version>
33-
<scope>test</scope>
34-
<type>jar</type>
35-
</dependency>
36-
<dependency>
37-
<groupId>javax.measure</groupId>
38-
<artifactId>unit-api</artifactId>
39-
<version>0.7</version>
40-
<type>jar</type>
4122
</dependency>
23+
4224
<dependency>
4325
<groupId>com.github.unitsofmeasurement</groupId>
4426
<artifactId>unit-ri</artifactId>
4527
<version>0.8-RC2</version>
4628
</dependency>
47-
<dependency>
48-
<groupId>org.antlr</groupId>
49-
<artifactId>stringtemplate</artifactId>
50-
<version>4.0.2</version>
51-
</dependency>
5229
<dependency>
5330
<groupId>org.apache.commons</groupId>
5431
<artifactId>commons-lang3</artifactId>
5532
<version>3.3.2</version>
5633
</dependency>
5734
</dependencies>
58-
<properties>
59-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
60-
</properties>
35+
<repositories>
36+
<repository>
37+
<id>jitpack.io</id>
38+
<url>https://jitpack.io</url>
39+
</repository>
40+
<repository>
41+
<snapshots>
42+
<enabled>false</enabled>
43+
</snapshots>
44+
<id>bintray-unitsofmeasurement-maven</id>
45+
<name>bintray</name>
46+
<url>http://dl.bintray.com/unitsofmeasurement/maven</url>
47+
</repository>
48+
<repository>
49+
<id>org.geppetto-mvn-repo</id>
50+
<url>https://raw.github.com/openworm/org.geppetto.maven/mvn-repo-nml-1.5.1-lems2</url>
51+
<snapshots>
52+
<enabled>true</enabled>
53+
<updatePolicy>always</updatePolicy>
54+
</snapshots>
55+
</repository>
56+
</repositories>
6157
<build>
6258
<plugins>
6359
<plugin>
@@ -86,6 +82,24 @@
8682
</lifecycleMappingMetadata>
8783
</configuration>
8884
</plugin>
85+
<plugin>
86+
<groupId>org.apache.felix</groupId>
87+
<artifactId>maven-bundle-plugin</artifactId>
88+
<version>2.3.7</version>
89+
<extensions>true</extensions>
90+
<configuration>
91+
<manifestLocation>src/main/java/META-INF</manifestLocation>
92+
<supportedProjectTypes>
93+
<supportedProjectType>jar</supportedProjectType>
94+
<supportedProjectType>bundle</supportedProjectType>
95+
</supportedProjectTypes>
96+
<instructions>
97+
<Bundle-Name>${project.artifactId}-${project.version}</Bundle-Name>
98+
<Bundle-SymbolicName>${project.artifactId}-${project.version}</Bundle-SymbolicName>
99+
<Provide-Capability>osgi.ee;osgi.ee=JavaSE;version=1.7</Provide-Capability>
100+
</instructions>
101+
</configuration>
102+
</plugin>
89103
<plugin>
90104
<groupId>org.apache.maven.plugins</groupId>
91105
<artifactId>maven-compiler-plugin</artifactId>
@@ -111,9 +125,16 @@
111125
</configuration>
112126
</plugin>
113127
<plugin>
128+
<dependencies>
129+
<dependency>
130+
<groupId>org.antlr</groupId>
131+
<artifactId>antlr4-maven-plugin</artifactId>
132+
<version>4.7</version>
133+
</dependency>
134+
</dependencies>
114135
<groupId>org.antlr</groupId>
115136
<artifactId>antlr4-maven-plugin</artifactId>
116-
<version>4.2</version>
137+
<version>4.7</version>
117138
<configuration>
118139
<listener>false</listener>
119140
<visitor>true</visitor>
@@ -126,6 +147,52 @@
126147
</execution>
127148
</executions>
128149
</plugin>
150+
<plugin>
151+
<groupId>org.apache.maven.plugins</groupId>
152+
<artifactId>maven-dependency-plugin</artifactId>
153+
<configuration>
154+
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
155+
<includeScope>runtime</includeScope>
156+
<excludeScope>provided</excludeScope>
157+
</configuration>
158+
<executions>
159+
<execution>
160+
<id>copy-dependencies</id>
161+
<phase>generate-resources</phase>
162+
<goals>
163+
<goal>copy-dependencies</goal>
164+
</goals>
165+
</execution>
166+
</executions>
167+
</plugin>
129168
</plugins>
169+
<pluginManagement>
170+
<plugins>
171+
<plugin>
172+
<groupId>org.eclipse.m2e</groupId>
173+
<artifactId>lifecycle-mapping</artifactId>
174+
<version>1.0.0</version>
175+
<configuration>
176+
<lifecycleMappingMetadata>
177+
<pluginExecutions>
178+
<pluginExecution>
179+
<pluginExecutionFilter>
180+
<groupId>org.apache.maven.plugins</groupId>
181+
<artifactId>maven-dependency-plugin</artifactId>
182+
<versionRange>[2.0,)</versionRange>
183+
<goals>
184+
<goal>copy-dependencies</goal>
185+
</goals>
186+
</pluginExecutionFilter>
187+
<action>
188+
<ignore />
189+
</action>
190+
</pluginExecution>
191+
</pluginExecutions>
192+
</lifecycleMappingMetadata>
193+
</configuration>
194+
</plugin>
195+
</plugins>
196+
</pluginManagement>
130197
</build>
131198
</project>

src/main/java/org/lemsml/expr_parser/utils/DirectedGraph.java renamed to src/main/java/org/lemsml/exprparser/utils/DirectedGraph.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.utils;
1+
package org.lemsml.exprparser.utils;
22

33
import java.util.Collection;
44
import java.util.Collections;

src/main/java/org/lemsml/expr_parser/utils/ExpressionParser.java renamed to src/main/java/org/lemsml/exprparser/utils/ExpressionParser.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.utils;
1+
package org.lemsml.exprparser.utils;
22

33
import java.util.Map;
44
import java.util.Set;
@@ -8,12 +8,12 @@
88

99
import org.antlr.v4.runtime.misc.ParseCancellationException;
1010

11-
import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
12-
import org.lemsml.expr_parser.visitors.ContextEvalVisitor;
13-
import org.lemsml.expr_parser.visitors.DimensionalAnalysisVisitor;
14-
import org.lemsml.expr_parser.visitors.ListVariablesInExprVisitor;
15-
import org.lemsml.expr_parser.visitors.QuantityConditionalEvalVisitor;
16-
import org.lemsml.expr_parser.visitors.QuantityEvalVisitor;
11+
import org.lemsml.exprparser.visitors.AntlrExpressionParser;
12+
import org.lemsml.exprparser.visitors.ContextEvalVisitor;
13+
import org.lemsml.exprparser.visitors.DimensionalAnalysisVisitor;
14+
import org.lemsml.exprparser.visitors.ListVariablesInExprVisitor;
15+
import org.lemsml.exprparser.visitors.QuantityConditionalEvalVisitor;
16+
import org.lemsml.exprparser.visitors.QuantityEvalVisitor;
1717

1818
public class ExpressionParser {
1919

src/main/java/org/lemsml/expr_parser/utils/SymbolExpander.java renamed to src/main/java/org/lemsml/exprparser/utils/SymbolExpander.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.lemsml.expr_parser.utils;
1+
package org.lemsml.exprparser.utils;
22

33
import java.util.LinkedHashMap;
44
import java.util.LinkedList;
55
import java.util.Queue;
66

7-
import org.lemsml.expr_parser.visitors.AntlrExpressionParser;
8-
import org.lemsml.expr_parser.visitors.ExpandSymbols;
7+
import org.lemsml.exprparser.visitors.AntlrExpressionParser;
8+
import org.lemsml.exprparser.visitors.ExpandSymbols;
99

1010
public class SymbolExpander {
1111
public static final LinkedHashMap<String, String> expandSymbols(

src/main/java/org/lemsml/expr_parser/utils/TextUtils.java renamed to src/main/java/org/lemsml/exprparser/utils/TextUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.utils;
1+
package org.lemsml.exprparser.utils;
22

33
import java.util.Arrays;
44

src/main/java/org/lemsml/expr_parser/utils/TopologicalSort.java renamed to src/main/java/org/lemsml/exprparser/utils/TopologicalSort.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.utils;
1+
package org.lemsml.exprparser.utils;
22

33
import java.util.ArrayList;
44
import java.util.HashSet;

src/main/java/org/lemsml/expr_parser/utils/UndefinedSymbolException.java renamed to src/main/java/org/lemsml/exprparser/utils/UndefinedSymbolException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.utils;
1+
package org.lemsml.exprparser.utils;
22

33
public class UndefinedSymbolException extends Exception {
44

src/main/java/org/lemsml/expr_parser/visitors/ARenderAs.java renamed to src/main/java/org/lemsml/exprparser/visitors/ARenderAs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.visitors;
1+
package org.lemsml.exprparser.visitors;
22

33
import org.antlr.v4.runtime.Token;
44

src/main/java/org/lemsml/expr_parser/visitors/AntlrExpressionParser.java renamed to src/main/java/org/lemsml/exprparser/visitors/AntlrExpressionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.lemsml.expr_parser.visitors;
1+
package org.lemsml.exprparser.visitors;
22

33
import org.antlr.v4.runtime.ANTLRInputStream;
44
import org.antlr.v4.runtime.CommonTokenStream;

0 commit comments

Comments
 (0)