project update

grammar-selector/Selector.g4

@@ -1,52 +1,26 @@
 grammar Selector;
 
 
-init			: 	selectors
+init			: 	'[' selectors ']'
 				;
 
 selectors		:	selector (',' selector)*
 				;
 
 selector		:	statement
-				|   selector operator selector <assoc=right>
-				;
+						|	statement operator selector
+						;
 
-attribute		:	'[' ID '=' ID ']'
+attribute		:	'[' Property=ID '=' Value=ID ']'
 				;
 
 operator		:	'>'
-				|	'+'
-				;
-
-statement 		:	baseStatement attribute*
 				;
 
-baseStatement   :	Statement=WHILE
-				|	Statement=FOREACH
-				|	Statement=FUNCTION
-				|	Statement=IF
-				|	Statement=TRUE_STATEMENT
-				|	Statement=ELSE_STATEMENT
-				|	Statement=BODY
-				|	Statement=EXPRESSION
-				|	Statement=VARIABLE
-				|	Statement=ALL
+statement 		:	Selector=ID Attributes=attribute*
 				;
 
-
-WHILE 			:	'while';
-FOREACH 		:	'foreach';
-FUNCTION		:	'function';
-IF 				:	'if';
-TRUE_STATEMENT	:	'else-if';
-ELSE_STATEMENT	:	'else';
-BODY			:	'body';
-EXPRESSION		:	'expression';
-VARIABLE		:	'variable';
-DECLARATION		:	'declaration';
-ALL				:	'*';
-
-ID    			:   '@'? (LETTER|'_') (LETTER|'_'|'-'|[0-9])*;
+ID    			:   ('@'? (LETTER|'_') (LETTER|'_'|'-'|[0-9])*) | '*';
 
 fragment
 LETTER  		:   [a-zA-Z];

grammar-selector/example.txt

@@ -1 +1 @@
-if[condition=true][attribute=not-null] > body > if > body + while
+[if > sequence > sequence]

grammar-selector/src/Selector.tokens

@@ -1,37 +1,13 @@
-FUNCTION=9
-NEWLINE=20
-VARIABLE=15
-WHILE=7
-T__1=5
-ALL=17
-T__0=6
-T__3=3
-T__2=4
-WHITESPACE=19
-TRUE_STATEMENT=11
-FOREACH=8
-ELSE_STATEMENT=12
-BODY=13
-ID=18
-DECLARATION=16
-EXPRESSION=14
-T__5=1
-IF=10
-T__4=2
-'foreach'=8
-'else-if'=11
-'else'=12
-'>'=2
-'expression'=14
-'='=6
-'if'=10
-'*'=17
-'['=5
-'while'=7
-'body'=13
-'+'=4
+WHITESPACE=7
+NEWLINE=8
+ID=6
+T__1=4
+T__0=5
+T__3=2
+T__2=3
+T__4=1
+'='=5
+'['=4
 ','=3
-'function'=9
-'variable'=15
-'declaration'=16
+'>'=2
 ']'=1

grammar-selector/src/SelectorBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from ../Selector.g4 by ANTLR 4.2
+// Generated from ../Selector.g4 by ANTLR 4.1
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.misc.NotNull;
@@ -13,117 +13,104 @@
 public class SelectorBaseListener implements SelectorListener {
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterStatement(@NotNull SelectorParser.StatementContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitStatement(@NotNull SelectorParser.StatementContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterSelector(@NotNull SelectorParser.SelectorContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitSelector(@NotNull SelectorParser.SelectorContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterSelectors(@NotNull SelectorParser.SelectorsContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitSelectors(@NotNull SelectorParser.SelectorsContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBaseStatement(@NotNull SelectorParser.BaseStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBaseStatement(@NotNull SelectorParser.BaseStatementContext ctx) { }
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterAttribute(@NotNull SelectorParser.AttributeContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitAttribute(@NotNull SelectorParser.AttributeContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterInit(@NotNull SelectorParser.InitContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitInit(@NotNull SelectorParser.InitContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterOperator(@NotNull SelectorParser.OperatorContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitOperator(@NotNull SelectorParser.OperatorContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void enterEveryRule(@NotNull ParserRuleContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void exitEveryRule(@NotNull ParserRuleContext ctx) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void visitTerminal(@NotNull TerminalNode node) { }
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p/>
+	 * The default implementation does nothing.
 	 */
 	@Override public void visitErrorNode(@NotNull ErrorNode node) { }
 }

grammar-selector/src/SelectorBaseVisitor.java

@@ -1,4 +1,4 @@
-// Generated from ../Selector.g4 by ANTLR 4.2
+// Generated from ../Selector.g4 by ANTLR 4.1
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
@@ -13,57 +13,49 @@
 public class SelectorBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements SelectorVisitor<T> {
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
+	 * <p/>
+	 * The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.
 	 */
 	@Override public T visitStatement(@NotNull SelectorParser.StatementContext ctx) { return visitChildren(ctx); }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
+	 * <p/>
+	 * The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.
 	 */
 	@Override public T visitSelector(@NotNull SelectorParser.SelectorContext ctx) { return visitChildren(ctx); }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
+	 * <p/>
+	 * The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.
 	 */
 	@Override public T visitSelectors(@NotNull SelectorParser.SelectorsContext ctx) { return visitChildren(ctx); }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitBaseStatement(@NotNull SelectorParser.BaseStatementContext ctx) { return visitChildren(ctx); }
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
+	 * <p/>
+	 * The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.
 	 */
 	@Override public T visitAttribute(@NotNull SelectorParser.AttributeContext ctx) { return visitChildren(ctx); }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
+	 * <p/>
+	 * The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.
 	 */
 	@Override public T visitInit(@NotNull SelectorParser.InitContext ctx) { return visitChildren(ctx); }
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
+	 * <p/>
+	 * The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.
 	 */
 	@Override public T visitOperator(@NotNull SelectorParser.OperatorContext ctx) { return visitChildren(ctx); }
 }