Repository: flex-falcon Updated Branches: refs/heads/feature/FLEX-35235 d66093a73 -> 81ffd73b3
Changes in lexer & paper to allow calc function in CSS Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/81ffd73b Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/81ffd73b Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/81ffd73b Branch: refs/heads/feature/FLEX-35235 Commit: 81ffd73b3e96f16da690d69b40843edf5008d64a Parents: d66093a Author: Carlos Rovira <[email protected]> Authored: Tue Jan 3 00:37:10 2017 +0100 Committer: Carlos Rovira <[email protected]> Committed: Tue Jan 3 00:37:10 2017 +0100 ---------------------------------------------------------------------- .../src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g | 4 ++++ .../main/antlr3/org/apache/flex/compiler/internal/css/CSSTree.g | 2 ++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/81ffd73b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g ---------------------------------------------------------------------- diff --git a/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g index 6fec15d..4f700ce 100644 --- a/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g +++ b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g @@ -435,6 +435,7 @@ value * #FF3322 * rgb(100%, 100%, 100%) * ClassReference("mx.controls.Button") + * calc((100% - 50px)/3); * PropertyReference("size") * Embed(source="assets/logo.png", mimeType="images/png") * url("../fonts/myfont.ttf") @@ -448,6 +449,8 @@ singleValue | HASH_WORD | CLASS_REFERENCE ARGUMENTS -> ^(CLASS_REFERENCE ARGUMENTS) + | CALC ARGUMENTS + -> ^(CALC ARGUMENTS) | PROPERTY_REFERENCE ARGUMENTS -> ^(PROPERTY_REFERENCE ARGUMENTS) | EMBED ARGUMENTS @@ -518,6 +521,7 @@ DOUBLE_COLON : '::' ; COLON : ':' ; AT_FONT_FACE : '@font-face' ; CLASS_REFERENCE : 'ClassReference' ; +CALC : 'calc' ; PROPERTY_REFERENCE : 'PropertyReference' ; IMPORTANT : '!important' ; EMBED : 'Embed' ; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/81ffd73b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSSTree.g ---------------------------------------------------------------------- diff --git a/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSSTree.g b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSSTree.g index b8d9587..4f7a97f 100644 --- a/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSSTree.g +++ b/compiler/src/main/antlr3/org/apache/flex/compiler/internal/css/CSSTree.g @@ -396,6 +396,8 @@ singleValue returns [CSSPropertyValue propertyValue] { $propertyValue = new CSSRgbaColorPropertyValue($RGBA.text, $start, tokenStream); } | ^(CLASS_REFERENCE cr=ARGUMENTS) { $propertyValue = new CSSFunctionCallPropertyValue($CLASS_REFERENCE.text, $cr.text, $start, tokenStream); } + | ^(CALC cr=ARGUMENTS) + { $propertyValue = new CSSFunctionCallPropertyValue($CALC.text, $cr.text, $start, tokenStream); } | ^(PROPERTY_REFERENCE pr=ARGUMENTS) { $propertyValue = new CSSFunctionCallPropertyValue($PROPERTY_REFERENCE.text, $pr.text, $start, tokenStream); } | ^(EMBED es=ARGUMENTS)
