compiler/libec: (#1059) Added support for 123.identifier

ecere · Feb 6, 2014 · 7f3496d · 7f3496d
1 parent 92c3391
commit 7f3496d
Show file tree

Hide file tree

Showing 15 changed files with 18,701 additions and 18,319 deletions.
diff --git a/compiler/bootstrap/libec/bootstrap/expression.c b/compiler/bootstrap/libec/bootstrap/expression.c
diff --git a/compiler/bootstrap/libec/bootstrap/grammar.c b/compiler/bootstrap/libec/bootstrap/grammar.c
diff --git a/compiler/bootstrap/libec/bootstrap/lexer.c b/compiler/bootstrap/libec/bootstrap/lexer.c
diff --git a/compiler/bootstrap/libec/bootstrap/type.c b/compiler/bootstrap/libec/bootstrap/type.c
diff --git a/compiler/libec/precompiled/expression.c b/compiler/libec/precompiled/expression.c
diff --git a/compiler/libec/precompiled/grammar.c b/compiler/libec/precompiled/grammar.c
diff --git a/compiler/libec/precompiled/type.c b/compiler/libec/precompiled/type.c
diff --git a/compiler/libec/src/expression.ec b/compiler/libec/src/expression.ec
diff --git a/compiler/libec/src/expression.y b/compiler/libec/src/expression.y
@@ -253,6 +253,19 @@ postfix_expression:
 	| postfix_expression '(' ')'                          { $$ = MkExpCall($1, MkList()); $$.call.argLoc.start = @2.start; $$.call.argLoc.end = @3.end; $$.loc = @$; }
 	| postfix_expression '(' argument_expression_list ')' { $$ = MkExpCall($1, $3); $$.call.argLoc.start = @2.start; $$.call.argLoc.end = @4.end; $$.loc = @$; }
 	| postfix_expression '.' identifier                   { $$ = MkExpMember($1, $3); $$.loc = @$; }
+   | postfix_expression identifier
+   {
+      char * constant = $1.type == constantExp ? $1.constant : null;
+      int len = constant ? strlen(constant) : 0;
+      if(constant && constant[len-1] == '.')
+      {
+         constant[len-1] = 0;
+         $$ = MkExpMember($1, $2);
+         $$.loc = @$;
+      }
+      else
+         yyerror();
+   }
 	| postfix_expression PTR_OP identifier                { $$ = MkExpPointer($1, $3); $$.loc = @$; }
 	| postfix_expression INC_OP                           { $$ = MkExpOp($1, INC_OP, null); $$.loc = @$; }
 	| postfix_expression DEC_OP                           { $$ = MkExpOp($1, DEC_OP, null); $$.loc = @$; }
@@ -265,6 +278,19 @@ simple_postfix_expression:
 	| simple_postfix_expression '(' ')'                          { $$ = MkExpCall($1, MkList()); $$.call.argLoc.start = @2.start; $$.call.argLoc.end = @3.end; $$.loc = @$; }
 	| simple_postfix_expression '(' argument_expression_list ')' { $$ = MkExpCall($1, $3); $$.call.argLoc.start = @2.start; $$.call.argLoc.end = @4.end; $$.loc = @$; }
 	| simple_postfix_expression '.' identifier                   { $$ = MkExpMember($1, $3); $$.loc = @$; }
+   | simple_postfix_expression identifier
+   {
+      char * constant = $1.type == constantExp ? $1.constant : null;
+      int len = constant ? strlen(constant) : 0;
+      if(constant && constant[len-1] == '.')
+      {
+         constant[len-1] = 0;
+         $$ = MkExpMember($1, $2);
+         $$.loc = @$;
+      }
+      else
+         yyerror();
+   }
 	| simple_postfix_expression PTR_OP identifier                { $$ = MkExpPointer($1, $3); $$.loc = @$; }
 	| simple_postfix_expression INC_OP                           { $$ = MkExpOp($1, INC_OP, null); $$.loc = @$; }
 	| simple_postfix_expression DEC_OP                           { $$ = MkExpOp($1, DEC_OP, null); $$.loc = @$; }

diff --git a/compiler/libec/src/grammar.ec b/compiler/libec/src/grammar.ec
diff --git a/compiler/libec/src/grammar.y b/compiler/libec/src/grammar.y
@@ -96,7 +96,7 @@ default:
             relational_expression_error equality_expression_error and_expression_error
             exclusive_or_expression_error inclusive_or_expression_error logical_and_expression_error
             logical_or_expression_error conditional_expression_error assignment_expression_error
-            simple_primary_expression
+            simple_primary_expression constant
             simple_postfix_expression simple_postfix_expression_error
             common_unary_expression common_unary_expression_error
             simple_unary_expression simple_unary_expression_error
@@ -1446,14 +1446,31 @@ i18n_string:
    | '$' string_literal '.' string_literal     { $$ = MkExpIntlString($4, $2); delete $2; delete $4; $$.loc = @$; }
    ;
 
+constant:
+   CONSTANT { $$ = MkExpConstant(yytext); $$.loc = @$; }
+   ;
+
 simple_primary_expression:
 	  identifier         { $$ = MkExpIdentifier($1); $$.loc = @$; }
    | instantiation_unnamed      { $$ = MkExpInstance($1); $$.loc = @$; }
    | EXTENSION '(' compound_statement ')'    { $$ = MkExpExtensionCompound($3); $$.loc = @$; }
    | EXTENSION '(' expression ')'    { $$ = MkExpExtensionExpression($3); $$.loc = @$; }
    | EXTENSION '(' type_name ')' initializer     { $$ = MkExpExtensionInitializer($3, $5); $$.loc = @$; }
    | EXTENSION '(' type_name ')' '(' type_name ')' initializer     { $$ = MkExpExtensionInitializer($3, MkInitializerAssignment(MkExpExtensionInitializer($6, $8))); $$.loc = @$; }
-	| CONSTANT           { $$ = MkExpConstant(yytext); $$.loc = @$; }
+   | constant identifier
+   {
+      char * constant = $1.constant;
+      int len = strlen(constant);
+      if(constant[len-1] == '.')
+      {
+         constant[len-1] = 0;
+         $$ = MkExpMember($1, $2);
+         $$.loc = @$;
+      }
+      else
+         yyerror();
+   }
+	| constant { $$ = $1; }
    | i18n_string
    | '(' ')' { Expression exp = MkExpDummy(); exp.loc.start = @1.end; exp.loc.end = @2.start; $$ = MkExpBrackets(MkListOne(exp)); $$.loc = @$; yyerror(); }
    | NEWOP new_specifiers abstract_declarator_noarray '[' constant_expression ']' { $$ = MkExpNew(MkTypeName($2,$3), $5); $$.loc = @$; }

diff --git a/compiler/libec/src/lexer.ec b/compiler/libec/src/lexer.ec
diff --git a/compiler/libec/src/lexer.l b/compiler/libec/src/lexer.l
@@ -2,8 +2,8 @@ D         [0-9]
 L         [a-zA-Z_]
 H         [a-fA-F0-9]
 E         [Ee][+-]?{D}+
-FS         (f|F|l|L|i|j)*
-IS         (u|U|l|L|i|j)*
+FS         (f|F|l|L|i|I|j|J)*
+IS         (u|U|l|L|i|I|j|J)*
 IDENT    {L}({L}|{D})*
 
 %{