8000 Rename package to org.scijava.parsington · scijava/parsington@c87f2e4 · GitHub
[go: up one dir, main page]
Skip to content

Commit c87f2e4

Browse files
ctruedenctrueden
committed
Rename package to org.scijava.parsington
This is more consistent with the artifact name, and avoids split packages with the scijava-common library. This is, of course, a 100% breaking change. But better now than later.
1 parent 24be31b commit c87f2e4

30 files changed

+99
-99
lines changed

‎README.md

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ Expression parsers are as old as the hills; what makes this one different?
2121
* __Separation of concerns.__ Parsington is a _parser_, not an _evaluator_.
2222
Once you have the postfix queue and/or syntax tree, what you do with it is
2323
your business (though there is a [small evaluation API in the eval
24-
subpackage](src/main/java/org/scijava/parse/eval) if that appeals to you).
24+
subpackage](src/main/java/org/scijava/parsington/eval) if that appeals to you).
2525
In general, there is no assumption that your variables will consist of any
2626
particular data type, numerical or otherwise.
2727
* __Extensibility.__ The
28-
[default operators](src/main/java/org/scijava/parse/Operators.java), a
28+
[default operators](src/main/java/org/scijava/parsington/Operators.java), a
2929
synthesis of Java and MATLAB syntax, work well. But if you need something
3030
else, you can define your own unary and binary operators with whatever
3131
symbols, precedence and associativity you desire.
3232
* __Clean, well-commented codebase with unit tests.__ Import the source into
3333
your favorite IDE and watch Parsington in action by putting a breakpoint
34-
[here](/scijava/parsington/blob/parsington-1.0.5/src/main/java/org/scijava/parse/ExpressionParser.java#L152-L154).
34+
[here](/scijava/parsington/blob/parsington-2.0.0/src/main/java/org/scijava/parsington/ExpressionParser.java#L152-L154).
3535

3636
## History
3737

@@ -50,7 +50,7 @@ In your POM `<dependencies>`:
5050
<dependency>
5151
<groupId>org.scijava</groupId>
5252
<artifactId>parsington</artifactId>
53-
<version>1.0.5</version>
53+
<version>2.0.0</version>
5454
</dependency>
5555
```
5656

@@ -119,7 +119,7 @@ Object result = new DefaultEvaluator().evaluate("6.5*7.8^2.3");
119119
### Interactive console
120120

121121
There is also an [interactive console
122-
shell](src/main/java/org/scijava/parse/Main.java) you can play with.
122+
shell](src/main/java/org/scijava/parsington/Main.java) you can play with.
123123

124124
Run it easily using [jgo](https://github.com/scijava/jgo):
125125
```
@@ -147,8 +147,8 @@ The `postfix` built-in function lets you introspect a parsed postfix queue:
147147
6.5 : java.lang.Double
148148
7.8 : java.lang.Double
149149
2.3 : java.lang.Double
150-
^ : org.scijava.parse.Operator
151-
* : org.scijava.parse.Operator
150+
^ : org.scijava.parsington.Operator
151+
* : org.scijava.parsington.Operator
152152
> postfix('[1, 2f, 3d, 4., 5L, 123456789987654321, 9987654321234567899]')
153153
1 : java.lang.Integer
154154
2.0 : java.lang.Float
@@ -157,28 +157,28 @@ The `postfix` built-in function lets you introspect a parsed postfix queue:
157157
5 : java.lang.Long
158158
123456789987654321 : java.lang.Long
159159
9987654321234567899 : java.math.BigInteger
160-
[7] : org.scijava.parse.Group
160+
[7] : org.scijava.parsington.Group
161161
> postfix('f(x, y) = x*y')
162-
f : org.scijava.parse.Variable
163-
x : org.scijava.parse.Variable
164-
y : org.scijava.parse.Variable
165-
(2) : org.scijava.parse.Group
166-
<Fn> : org.scijava.parse.Function
167-
x : org.scijava.parse.Variable
168-
y : org.scijava.parse.Variable
169-
* : org.scijava.parse.Operator
170-
= : org.scijava.parse.Operator
162+
f : org.scijava.parsington.Variable
163+
x : org.scijava.parsington.Variable
164+
y : org.scijava.parsington.Variable
165+
(2) : org.scijava.parsington.Group
166+
<Fn> : org.scijava.parsington.Function
167+
x : org.scijava.parsington.Variable
168+
y : org.scijava.parsington.Variable
169+
* : org.scijava.parsington.Operator
170+
= : org.scijava.parsington.Operator
171171
> postfix('math.pow(q) = q^q')
172-
math : org.scijava.parse.Variable
173-
pow : org.scijava.parse.Variable
174-
. : org.scijava.parse.Operator
175-
q : org.scijava.parse.Variable
176-
(1) : org.scijava.parse.Group
177-
<Fn> : org.scijava.parse.Function
178-
q : org.scijava.parse.Variable
179-
q : org.scijava.parse.Variable
180-
^ : org.scijava.parse.Operator
181-
= : org.scijava.parse.Operator
172+
math : org.scijava.parsington.Variable
173+
pow : org.scijava.parsington.Variable
174+
. : org.scijava.parsington.Operator
175+
q : org.scijava.parsington.Variable
176+
(1) : org.scijava.parsington.Group
177+
<Fn> : org.scijava.parsington.Function
178+
q : org.scijava.parsington.Variable
179+
q : org.scijava.parsington.Variable
180+
^ : org.scijava.parsington.Operator
181+
= : org.scijava.parsington.Operator
182182
```
183183

184184
The `tree` function is another way to introspect, in syntax tree form:
@@ -194,5 +194,5 @@ The `tree` function is another way to introspect, in syntax tree form:
194194
- '^'
195195
-- 'q'
196196
-- 'q'
197-
: org.scijava.parse.SyntaxTree
197+
: org.scijava.parsington.SyntaxTree
198198
```

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>parsington</artifactId>
13-
<version>1.0.6-SNAPSHOT</version>
13+
<version>2.0.0-SNAPSHOT</version>
1414

1515
<name>Parsington: The SciJava Expression Parser</name>
1616
<description>A general-purpose mathematical expression parser, which converts infix expression strings into postfix queues and/or syntax trees.</description>
@@ -80,8 +80,8 @@
8080

8181
<properties>
8282
<scijava.jvm.version>1.6</scijava.jvm.version>
83-
<main-class>org.scijava.parse.Main</main-class>
84-
<package-name>org.scijava.parse</package-name>
83+
<main-class>org.scijava.parsington.Main</main-class>
84+
<package-name>org.scijava.parsington</package-name>
8585

8686
<license.licenseName>bsd_2</license.licenseName>
8787
<license.projectName>Parsington: the SciJava mathematical expression parser.</license.projectName>

‎src/main/java/org/scijava/parse/ExpressionParser.java renamed to ‎src/main/java/org/scijava/parsington/ExpressionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
import java.util.ArrayDeque;
3434
import java.util.ArrayList;

‎src/main/java/org/scijava/parse/Function.java renamed to ‎src/main/java/org/scijava/parsington/Function.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
/**
3434
* A function is an implicit binary operator between two "noun"

‎src/main/java/org/scijava/parse/Group.java renamed to ‎src/main/java/org/scijava/parsington/Group.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
/**
3434
* A group is a special N-ary operator delineated by a left-hand symbol and a

‎src/main/java/org/scijava/parse/Literals.java renamed to ‎src/main/java/org/scijava/parsington/Literals.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
import java.math.BigDecimal;
3434
import java.math.BigInteger;

‎src/main/java/org/scijava/parse/Main.java renamed to ‎src/main/java/org/scijava/parsington/Main.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
import java.io.IOException;
3434

35-
import org.scijava.parse.eval.DefaultEvaluator;
36-
import org.scijava.parse.eval.EvaluatorConsole;
35+
import org.scijava.parsington.eval.DefaultEvaluator;
36+
import org.scijava.parsington.eval.EvaluatorConsole;
3737

3838
/**
3939
* Launches the console-driven expression evaluator.

‎src/main/java/org/scijava/parse/Operator.java renamed to ‎src/main/java/org/scijava/parsington/Operator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
/**
3434
* A mathematical operator is a special symbol or "verb" which defines a

‎src/main/java/org/scijava/parse/Operators.java renamed to ‎src/main/java/org/scijava/parsington/Operators.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

33-
import static org.scijava.parse.Operator.Associativity.LEFT;
34-
import static org.scijava.parse.Operator.Associativity.RIGHT;
33+
import static org.scijava.parsington.Operator.Associativity.LEFT;
34+
import static org.scijava.parsington.Operator.Associativity.RIGHT;
3535

3636
import java.lang.reflect.Field;
3737
import java.lang.reflect.Modifier;
3838
import java.util.ArrayList;
3939
import java.util.List;
4040

41-
import org.scijava.parse.Operator.Associativity;
41+
import org.scijava.parsington.Operator.Associativity;
4242

4343
/**
4444
* A collection of standard {@link Operator}s. This set of operators was

‎src/main/java/org/scijava/parse/Position.java renamed to ‎src/main/java/org/scijava/parsington/Position.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* #L%
2929
*/
3030

31-
package org.scijava.parse;
31+
package org.scijava.parsington;
3232

3333
/**
3434
* A mutable parse position. Similar to {@link java.text.ParsePosition}, but

0 commit comments

Comments
 (0)
0