Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CCS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Brice Videau
CCS
Commits
5bc0089d
Commit
5bc0089d
authored
Jul 22, 2020
by
Brice Videau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change priority of in (#) operator.
parent
4ef72124
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
bindings/ruby/lib/cconfigspace/expression.rb
bindings/ruby/lib/cconfigspace/expression.rb
+1
-1
include/cconfigspace/expression.h
include/cconfigspace/expression.h
+5
-5
src/expression.c
src/expression.c
+9
-9
No files found.
bindings/ruby/lib/cconfigspace/expression.rb
View file @
5bc0089d
...
...
@@ -8,7 +8,6 @@ module CCS
:CCS_GREATER
,
:CCS_LESS_OR_EQUAL
,
:CCS_GREATER_OR_EQUAL
,
:CCS_IN
,
:CCS_ADD
,
:CCS_SUBSTRACT
,
:CCS_MULTIPLY
,
...
...
@@ -17,6 +16,7 @@ module CCS
:CCS_POSITIVE
,
:CCS_NEGATIVE
,
:CCS_NOT
,
:CCS_IN
,
:CCS_LIST
,
:CCS_LITERAL
,
:CCS_VARIABLE
...
...
include/cconfigspace/expression.h
View file @
5bc0089d
...
...
@@ -14,7 +14,6 @@ enum ccs_expression_type_e {
CCS_GREATER
,
CCS_LESS_OR_EQUAL
,
CCS_GREATER_OR_EQUAL
,
CCS_IN
,
CCS_ADD
,
CCS_SUBSTRACT
,
CCS_MULTIPLY
,
...
...
@@ -23,6 +22,7 @@ enum ccs_expression_type_e {
CCS_POSITIVE
,
CCS_NEGATIVE
,
CCS_NOT
,
CCS_IN
,
CCS_LIST
,
CCS_LITERAL
,
CCS_VARIABLE
,
...
...
@@ -38,10 +38,10 @@ typedef enum ccs_expression_type_e ccs_expression_type_t;
// 1 : AND
// 2 : EQUAL, NOT_EQUAL
// 3 : LESS, GREATER, LESS_OR_EQUAL, GREATER_OR_EQUAL
// 4 :
IN
// 5 :
ADD, SUBSTRACT
// 6 :
MULTIPLY, DIVIDE, MODULO
// 7 :
POSITIVE, NEGATIVE, NOT
// 4 :
ADD, SUBSTRACT
// 5 :
MULTIPLY, DIVIDE, MODULO
// 6 :
POSITIVE, NEGATIVE, NOT
// 7 :
IN
// max - 1: LIST
// max : LITERAL, VARIABLE
...
...
src/expression.c
View file @
5bc0089d
...
...
@@ -9,10 +9,10 @@ const int ccs_expression_precedence[] = {
1
,
2
,
2
,
3
,
3
,
3
,
3
,
4
,
5
,
5
,
4
,
4
,
5
,
5
,
5
,
6
,
6
,
6
,
7
,
7
,
7
,
7
,
8
,
9
,
9
};
...
...
@@ -22,11 +22,11 @@ const ccs_associativity_type_t ccs_expression_associativity[] = {
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_RIGHT_TO_LEFT
,
CCS_RIGHT_TO_LEFT
,
CCS_RIGHT_TO_LEFT
,
CCS_LEFT_TO_RIGHT
,
CCS_LEFT_TO_RIGHT
,
CCS_ASSOCIATIVITY_TYPE_NONE
,
CCS_ASSOCIATIVITY_TYPE_NONE
};
...
...
@@ -35,10 +35,10 @@ const char *ccs_expression_symbols[] = {
"&&"
,
"=="
,
"!="
,
"<"
,
">"
,
"<="
,
">="
,
"#"
,
"+"
,
"-"
,
"*"
,
"/"
,
"%"
,
"+"
,
"-"
,
"!"
,
"#"
,
NULL
,
NULL
,
NULL
};
...
...
@@ -48,10 +48,10 @@ const int ccs_expression_arity[] = {
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
1
,
1
,
1
,
2
,
-
1
,
0
,
0
};
...
...
@@ -979,9 +979,6 @@ _ccs_expression_ops_broker(ccs_expression_type_t expression_type) {
case
CCS_GREATER_OR_EQUAL
:
return
&
_ccs_expr_greater_or_equal_ops
;
break
;
case
CCS_IN
:
return
&
_ccs_expr_in_ops
;
break
;
case
CCS_ADD
:
return
&
_ccs_expr_add_ops
;
break
;
...
...
@@ -1006,6 +1003,9 @@ _ccs_expression_ops_broker(ccs_expression_type_t expression_type) {
case
CCS_NOT
:
return
&
_ccs_expr_not_ops
;
break
;
case
CCS_IN
:
return
&
_ccs_expr_in_ops
;
break
;
case
CCS_LIST
:
return
&
_ccs_expr_list_ops
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment