Commit: 07a60acffe6c28f1f1d778f7067f19c73f5921f6 - mirrg.game.math.wulfenite (hg)

Commit MetaInfo

• Revision: 07a60acffe6c28f1f1d778f7067f19c73f5921f6 (tree)
• Zeit: 2015-11-13 07:17:47
• Autor: MirrgieRiana
• Commiter: MirrgieRiana

Log Message

test.libr: add: TokenCallFunction

Ändern Zusammenfassung

• modified: projects/mirrg.game.math.wulfenite/src/main/java/mirrg/game/math/wulfenite/script2/tnode/TNodes.java
• modified: projects/mirrg.game.math.wulfenite/src/main/resources/mirrg/game/math/wulfenite/script2/tnode/test.libr

Diff

diff -r 5b26d5afddd8 -r 07a60acffe6c projects/mirrg.game.math.wulfenite/src/main/java/mirrg/game/math/wulfenite/script2/tnode/TNodes.java
--- a/projects/mirrg.game.math.wulfenite/src/main/java/mirrg/game/math/wulfenite/script2/tnode/TNodes.java	Fri Nov 13 07:17:04 2015 +0900
+++ b/projects/mirrg.game.math.wulfenite/src/main/java/mirrg/game/math/wulfenite/script2/tnode/TNodes.java	Fri Nov 13 07:17:47 2015 +0900
@@ -329,18 +329,14 @@
 
 	}
 
-	public static class Function extends TNodeBase implements ITNodeExpression
+	public static class TokenCallFunction extends TNodeBase
 	{
 
 		public TokenIdentifier identifier;
 		public Operation arguments;
 
-		public ITNodeExpression call;
-
-		@Override
-		public boolean validate(ArgumentsValidate argumentsValidate)
+		public ITNodeExpression[] getExpressions()
 		{
-
 			ITNodeExpression[] expressions;
 			if (arguments == null) {
 				expressions = new ITNodeExpression[0];
@@ -352,8 +348,23 @@
 					expressions[i] = expression;
 				}
 			}
+			return expressions;
+		}
 
-			call = new Call(identifier.nodes, identifier.node.string.string, expressions);
+	}
+
+	public static class Function extends TNodeBase implements ITNodeExpression
+	{
+
+		public TokenCallFunction token;
+
+		public ITNodeExpression call;
+
+		@Override
+		public boolean validate(ArgumentsValidate argumentsValidate)
+		{
+			ITNodeExpression[] expressions = token.getExpressions();
+			call = new Call(token.identifier.nodes, token.identifier.node.string.string, expressions);
 
 			if (!call.validate(argumentsValidate)) return false;
 

diff -r 5b26d5afddd8 -r 07a60acffe6c projects/mirrg.game.math.wulfenite/src/main/resources/mirrg/game/math/wulfenite/script2/tnode/test.libr
--- a/projects/mirrg.game.math.wulfenite/src/main/resources/mirrg/game/math/wulfenite/script2/tnode/test.libr	Fri Nov 13 07:17:04 2015 +0900
+++ b/projects/mirrg.game.math.wulfenite/src/main/resources/mirrg/game/math/wulfenite/script2/tnode/test.libr	Fri Nov 13 07:17:47 2015 +0900
@@ -19,16 +19,16 @@
 TokenInteger := Comments <radix>=IntegerUnsigned 'x' <string>="[0-9a-zA-Z]+" : <TokenInteger>;
 TokenReal := Comments <node>=Real : <TokenReal>;
 TokenImaginary := Comments <node>=Imaginary : <TokenImaginary>;
+TokenCallFunction := <identifier>=TokenIdentifier
+                    Comments '('
+                    <arguments>=?[Expression,
+                      Comments ','
+                    ]
+                    Comments ')' : <TokenCallFunction>;
 
 // ■因子
 Variable := <identifier>=TokenIdentifier : <Variable>;
-Function := <identifier>=TokenIdentifier
-            Comments '('
-            <arguments>=?[Expression,
-              Comments ','
-            ]
-            Comments ')'
-            : <Function>;
+Function := <token>=TokenCallFunction : <Function>;
 LiteralNumeric := <token>=( TokenDecimal
                           | TokenInteger
                           | TokenReal