Merge pull request #42 from javecs/feature/operator

符号と累乗演算処理

Author: javecs

README.md

@@ -62,14 +62,16 @@
 
 ## 計算可能な数式
 
-### 演算
+### 演算子
 
-演算 | 説明 | 例 | 結果 
+演算子 | 説明 | 例 | 結果 
 --------| --------|--------|--------
+  ^ | 累乗 | 2 ^ 3 ^ 2| 512 (`2^(3^2)`と処理されます）
+  +（符号）| 正数 | +1 | 1
+  -（符号）| 負数 | -1 | -1
   * | 掛け算 | 3 * 4 | 12
   / | 割り算 | 3 / 4 | 0.75
   % | 余り | 7 % 4 | 3
-  ^ | 累乗 | 2 ^ 8 | 256
   + | 足し算 | 3 + 4 | 7
   - | 引き算 | 3 - 4 | -1
 

src/main/antlr/Expr.g4

@@ -1,19 +1,20 @@
 grammar Expr;
 
 start: stat+ ;
-stat: expr              # StatExpr
-    | ID '=' expr       # Assign
+stat: expr                          # StatExpr
+    | ID '=' expr                   # Assign
     ;
-expr: expr '*' expr     # Mul
-    | expr '/' expr     # Div
-    | expr '%' expr     # Mod
-    | expr '^' expr     # Pow
-    | expr '+' expr     # Add
-    | expr '-' expr     # Sub
-    | NUMBER            # Number
-    | ID                # Id
-    | '(' expr ')'      # Parens
-    | func '(' expr ')' # Math
+expr: <assoc=right> expr '^' expr   # Pow
+    | ('+'|'-') expr                # Sign
+    | expr '*' expr                 # Mul
+    | expr '/' expr                 # Div
+    | expr '%' expr                 # Mod
+    | expr '+' expr                 # Add
+    | expr '-' expr                 # Sub
+    | NUMBER                        # Number
+    | ID                            # Id
+    | '(' expr ')'                  # Parens
+    | func '(' expr ')'             # Math
     ;
 func: 'sin'
     | 'cos'

src/main/java/xyz/javecs/tools/expr/parser/Expr.tokens

@@ -14,12 +14,12 @@ NUMBER=13
 ID=14
 WS=15
 '='=1
-'*'=2
-'/'=3
-'%'=4
-'^'=5
-'+'=6
-'-'=7
+'^'=2
+'+'=3
+'-'=4
+'*'=5
+'/'=6
+'%'=7
 '('=8
 ')'=9
 'sin'=10

src/main/java/xyz/javecs/tools/expr/parser/ExprBaseVisitor.java

@@ -88,6 +88,13 @@ public class ExprBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements E
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitPow(ExprParser.PowContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitSign(ExprParser.SignContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/xyz/javecs/tools/expr/parser/ExprLexer.java

@@ -33,7 +33,7 @@ public class ExprLexer extends Lexer {
 	};
 
 	private static final String[] _LITERAL_NAMES = {
-		null, "'='", "'*'", "'/'", "'%'", "'^'", "'+'", "'-'", "'('", "')'", "'sin'", 
+		null, "'='", "'^'", "'+'", "'-'", "'*'", "'/'", "'%'", "'('", "')'", "'sin'", 
 		"'cos'", "'tan'"
 	};
 	private static final String[] _SYMBOLIC_NAMES = {
@@ -112,8 +112,8 @@ public ExprLexer(CharStream input) {
 		"\2\2\35\3\2\2\2\2\37\3\2\2\2\3!\3\2\2\2\5#\3\2\2\2\7%\3\2\2\2\t\'\3\2"+
 		"\2\2\13)\3\2\2\2\r+\3\2\2\2\17-\3\2\2\2\21/\3\2\2\2\23\61\3\2\2\2\25\63"+
 		"\3\2\2\2\27\67\3\2\2\2\31;\3\2\2\2\33@\3\2\2\2\35L\3\2\2\2\37T\3\2\2\2"+
-		"!\"\7?\2\2\"\4\3\2\2\2#$\7,\2\2$\6\3\2\2\2%&\7\61\2\2&\b\3\2\2\2\'(\7"+
-		"\'\2\2(\n\3\2\2\2)*\7`\2\2*\f\3\2\2\2+,\7-\2\2,\16\3\2\2\2-.\7/\2\2.\20"+
+		"!\"\7?\2\2\"\4\3\2\2\2#$\7`\2\2$\6\3\2\2\2%&\7-\2\2&\b\3\2\2\2\'(\7/\2"+
+		"\2(\n\3\2\2\2)*\7,\2\2*\f\3\2\2\2+,\7\61\2\2,\16\3\2\2\2-.\7\'\2\2.\20"+
 		"\3\2\2\2/\60\7*\2\2\60\22\3\2\2\2\61\62\7+\2\2\62\24\3\2\2\2\63\64\7u"+
 		"\2\2\64\65\7k\2\2\65\66\7p\2\2\66\26\3\2\2\2\678\7e\2\289\7q\2\29:\7u"+
 		"\2\2:\30\3\2\2\2;<\7v\2\2<=\7c\2\2=>\7p\2\2>\32\3\2\2\2?A\t\2\2\2@?\3"+

src/main/java/xyz/javecs/tools/expr/parser/ExprLexer.tokens

@@ -14,12 +14,12 @@ NUMBER=13
 ID=14
 WS=15
 '='=1
-'*'=2
-'/'=3
-'%'=4
-'^'=5
-'+'=6
-'-'=7
+'^'=2
+'+'=3
+'-'=4
+'*'=5
+'/'=6
+'%'=7
 '('=8
 ')'=9
 'sin'=10