Working detached rulesets draft with enabled unit tests. Most cases w…

…ork, but the whole thing needs some more testing and clean up. #186
SomMeri · Jun 24, 2014 · ddfb7d6 · ddfb7d6
1 parent 9c75589
commit ddfb7d6
Show file tree

Hide file tree

Showing 40 changed files with 475 additions and 368 deletions.
diff --git a/src/main/antlr3/com/github/sommeri/less4j/core/parser/Less.g b/src/main/antlr3/com/github/sommeri/less4j/core/parser/Less.g
@@ -806,8 +806,8 @@ finally { leaveRule(); }
 
 detachedRulesetReference
 @init {enterRule(retval, RULE_DETACHED_RULESET_REFERENCE);}
-    : a=AT_NAME (LPAREN RPAREN)? SEMI
-    -> ^(DETACHED_RULESET_REFERENCE $a)
+    : a+=AT_NAME (a+=LPAREN? a+=RPAREN?) SEMI
+    -> ^(DETACHED_RULESET_REFERENCE $a*)
     ;
 finally { leaveRule(); }
 

diff --git a/src/main/java/com/github/sommeri/less4j/core/ast/MixinReference.java b/src/main/java/com/github/sommeri/less4j/core/ast/MixinReference.java
@@ -145,7 +145,8 @@ public MixinReference clone() {
     result.configureParentToAllChilds();
     return result;
   }
-
+
+  @NotAstProperty
   public List<Expression> getAllPositionalArgumentsFrom(int startIndx) {
     if (hasPositionalParameter(startIndx))
       return positionalParameters.subList(startIndx, positionalParameters.size());

diff --git a/src/main/java/com/github/sommeri/less4j/core/compiler/LessToCssCompiler.java b/src/main/java/com/github/sommeri/less4j/core/compiler/LessToCssCompiler.java
@@ -14,7 +14,7 @@
 import com.github.sommeri.less4j.core.ast.FixedMediaExpression;
 import com.github.sommeri.less4j.core.ast.MediaExpressionFeature;
 import com.github.sommeri.less4j.core.ast.StyleSheet;
-import com.github.sommeri.less4j.core.compiler.expressions.ExpressionEvaluator;
+import com.github.sommeri.less4j.core.compiler.expressions.IScopeAwareExpressionsEvaluator;
 import com.github.sommeri.less4j.core.compiler.scopes.IScope;
 import com.github.sommeri.less4j.core.compiler.selectors.ExtendsSolver;
 import com.github.sommeri.less4j.core.compiler.selectors.UselessLessElementsRemover;
@@ -152,7 +152,7 @@ private int code(ASTCssNode node) {
   private void evaluateExpressions(ASTCssNode node) {
     ASTManipulator manipulator = new ASTManipulator();
     //variables are not supposed to be there now
-    ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator(problemsHandler, configuration);
+    IScopeAwareExpressionsEvaluator expressionEvaluator = new IScopeAwareExpressionsEvaluator(problemsHandler, configuration);
 
     if (node instanceof Expression) {
       Expression value = expressionEvaluator.evaluate((Expression) node);