fix stupid recursion

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -1567,13 +1567,7 @@ LexicalUnit term(LexicalUnit prev) :
   Locator locator = null;
 }
 {
-    ( op = unaryOperator() )?
-    {
-        if (op != ' ')
-        {
-            locator = createLocator(token);
-        }
-    }
+    ( op = unaryOperator() )?    { if (op != ' ') { locator = createLocator(token); } }
     (
         (   value = number(prev, op)
             | value = dimension(prev, op)
@@ -1646,7 +1640,7 @@ LexicalUnit function(LexicalUnit prev) :
             )?
             body = term(body)
         )*
-    )? 
+    )?
     <RROUND>
     {
         return functionInternal(prev, funct, param);
@@ -1758,6 +1752,7 @@ LexicalUnit calcValue(LexicalUnit prev) :
                     | prev = percentage(prev, op)
                 )
             )
+            | prev = var(prev)
             |
                 (
                     (
@@ -1862,6 +1857,7 @@ LexicalUnit calcNumberValue(LexicalUnit prev) :
                 (op = unaryOperator() )?
                 prev = number(prev, op)
             )
+            | prev = var(prev)
             |
             (
                 (
@@ -1894,18 +1890,18 @@ LexicalUnit calcNumberValue(LexicalUnit prev) :
 LexicalUnit var(LexicalUnit prev) :
 {
     Token t;
-    LexicalUnit value, propertyName;
+    LexicalUnit value, current, propertyName;
     String funct = "";
 }
 {
     t = <FUNCTION_VAR> { funct = unescape(t.image, false); }
     ( <S> )*
-    t = <CUSTOM_PROPERTY_NAME> { prev = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); propertyName = prev; }
+    t = <CUSTOM_PROPERTY_NAME> { current = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); propertyName = current; }
     ( <S> )*
     (
-        <COMMA> { prev = LexicalUnitImpl.createComma(prev); }
+        <COMMA> { current = LexicalUnitImpl.createComma(current); }
         ( <S> )*
-        prev = term(prev)
+        current = term(current)
     )*
     <RROUND>
     {

src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java

@@ -1241,36 +1241,37 @@ public void calcExpressions() throws Exception {
         expression("h1 { top: calc(14 + (7 + 3) - 1) }");
     }
 
+    @Test
     public void varExpressions() throws Exception {
         // test cases for successful parsing
-        expression("#v { --my-var: 3 }");
-        expression("#v { --my-var: 2px }");
-        expression("#v { --my-var: 10pt }");
-        expression("#v { --my-var: 11% }");
-        expression("#v { --my-var: rgb(255, 255, 255) }");
-        expression("#v { --my-var: rgba(255, 255, 255, 0) }");
-        expression("#v { --my-var: var(--test) }");
-        expression("#v { --my-var: \"test\" }");
-        expression("#v { --my-var: 3 }");
-        expression("#v { --my-var: 3; top: var(--my-var, 10) }");
-        expression("#v { --my-var: -2; top: var(--my-var, 10) }");
-        expression("#v { --my-var: -2; top: var(--my-var, 10, 11) }");
-        expression("#v { --my-var: -2; top: var(--my-var, 10, 11, 12, \"test\") }");
-        expression("#v { --my-var: -2; top: var(--my-var, 10, 11, 12, rgb(12, 24, 35)) }");
+        expression("h1 { --my-var: 3 }");
+        expression("h1 { --my-var: 2px }");
+        expression("h1 { --my-var: 10pt }");
+        expression("h1 { --my-var: 11% }");
+        expression("h1 { --my-var: rgb(255, 255, 255) }");
+        expression("h1 { --my-var: rgba(255, 255, 255, 0) }");
+        expression("h1 { --my-var: var(--test) }");
+        expression("h1 { --my-var: \"test\" }");
+        expression("h1 { --my-var: 3 }");
+        expression("h1 { --my-var: 3; top: var(--my-var, 10) }");
+        expression("h1 { --my-var: -2; top: var(--my-var, 10) }");
+        expression("h1 { --my-var: -2; top: var(--my-var, 10, 11) }");
+        expression("h1 { --my-var: -2; top: var(--my-var, 10, 11, 12, \"test\") }");
+        expression("h1 { --my-var: -2; top: var(--my-var, 10, 11, 12, rgb(12, 24, 35)) }");
 
         // special test cases with different expected result
-        expression("#v { --my-var: +11; top: var(--my-var, 10) }",
-                    "#v { --my-var: 11; top: var(--my-var, 10) }");
-        expression("#v { --my-var: -2; top: var(--my-var, 10, 11, 12, 'test') }",
-                    "#v { --my-var: -2; top: var(--my-var, 10, 11, 12, \"test\") }");
-        expression("#v { --my-var: 'test' }",
-                    "#v { --my-var: \"test\" }");
+        expression("h1 { --my-var: +11; top: var(--my-var, 10) }",
+                    "h1 { --my-var: 11; top: var(--my-var, 10) }");
+        expression("h1 { --my-var: -2; top: var(--my-var, 10, 11, 12, 'test') }",
+                    "h1 { --my-var: -2; top: var(--my-var, 10, 11, 12, \"test\") }");
+        expression("h1 { --my-var: 'test' }",
+                    "h1 { --my-var: \"test\" }");
 
         // test cases for unsuccessful parsing
-        expression("#v { --my-var: var(test) }", 1, 0, 0);
-        expression("#v { --my-var: var() }", 1, 0, 0);
-        expression("#v { --my-var: var(-test) }", 1, 0, 0);
-        expression("#v { --my-var: var(---test) }", 1, 0, 0);
+        expression("h1 { --my-var: var(test) }", 1, 0, 0);
+        expression("h1 { --my-var: var() }", 1, 0, 0);
+        expression("h1 { --my-var: var(-test) }", 1, 0, 0);
+        expression("h1 { --my-var: var(---test) }", 1, 0, 0);
     }
 
     private void expression(String cssText) throws Exception {