You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/03/01 21:04:01 UTC
[4/9] git commit: [flex-falcon] [refs/heads/dual] - fix css calc
parsing
fix css calc parsing
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/962fd89f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/962fd89f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/962fd89f
Branch: refs/heads/dual
Commit: 962fd89fe9cca20e7da25886ab6db157f616386a
Parents: a08b7b1
Author: Alex Harui <ah...@apache.org>
Authored: Wed Mar 1 12:58:09 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Mar 1 12:58:09 2017 -0800
----------------------------------------------------------------------
compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css | 2 +-
.../src/test/resources/flexjs/files/CSSTestSource_result.css | 2 +-
.../src/main/antlr3/org/apache/flex/compiler/internal/css/CSS.g | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/962fd89f/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
index f18dc6f..6bbb192 100755
--- a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
+++ b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource.css
@@ -84,5 +84,5 @@
.usescalc {
color: #fff;
- width: calc((100% - 50px)/3;
+ width: calc((100% - 50px)/3);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/962fd89f/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
index 6a17c84..bc01e64 100755
--- a/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
+++ b/compiler-jx/src/test/resources/flexjs/files/CSSTestSource_result.css
@@ -85,7 +85,7 @@
.usescalc {
color: #fff;
- width: calc((100% - 50px) / 3;
+ width: calc((100% - 50px)/3);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/962fd89f/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 af9348a..726b09f 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
@@ -580,9 +580,9 @@ RGB : 'rgb(' ( WS* NUMBER ( PERCENT | ) WS* ) ','
/** Arguments of a function call property value. */
ARGUMENTS
- : '(' ( options {greedy=false;}: . )* ')'
+ : '(' ( options {greedy=false;}: ARGUMENTS | . )* ')'
;
-
+
/**
* Match multiple semi-colons in Lexer level so that the parser can have a
* finite number of look ahead, instead of LL(*);