use ident() at more places

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -1606,7 +1606,7 @@ LexicalUnit term(LexicalUnit prev) :
         | t = "progid:"         { value = LexicalUnitImpl.createIdent(prev, skipUnit().trim()); }
         |
             (
-                t = <IDENT>
+                t = identExcludingInherit()
                 ( <COLON> { throw toCSSParseException("invalidExprColon", new String[]{ unescape(t.image, false) }, createLocator(t)); } )?
             )
             { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
@@ -1622,9 +1622,6 @@ LexicalUnit term(LexicalUnit prev) :
                     t.image.substring(n+1));
             }
         | t = <INHERIT>         { value = LexicalUnitImpl.createInherit(prev); }
-        | t = <ONLY>            { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
-        | t = <NONE>            { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
-        | t = <FROM>            { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
     )
         {
             if (locator == null)
@@ -2348,6 +2345,31 @@ Token ident() :
         }
 }
 
+Token identExcludingInherit() :
+{
+    Token t;
+}
+{
+    t = <IDENT> { return t; }
+    |
+        (
+            t = <ONLY>
+            | t = <NONE>
+            | t = <FROM>
+        )
+        {
+            Token ident = new Token(IDENT, unescape(t.image, false));
+            ident.beginLine = t.beginLine;
+            ident.beginColumn = t.endColumn;
+            ident.endLine = t.beginLine;
+            ident.endColumn = t.endColumn;
+            ident.next = t.next;
+            ident.specialToken = t.specialToken;
+            return ident;
+            
+        }
+}
+
 
 //
 // number()