Unverified Commit 23c8fd5c authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by GitHub
Browse files

Merge pull request #3814 from eisenhauer/FFSUpstream 

FFS upstream
parents 1949cde6 17a0e681

thirdparty/ffs/ffs/cod/cod.l

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ return {RETURN(RETURN_TOKEN);} 
[A-Za-z_][A-Za-z0-9_]*	{

				yylval.info.string = create_string_from_yytext();

				if (is_defined_type(yylval.info.string)) {

				    RETURN(type_id);

				    RETURN(type_identifier);

				} else if (is_enumeration_constant(yylval.info.string)) {

				    RETURN(enumeration_constant);

				} else {

thirdparty/ffs/ffs/cod/cod.y

+2 −2
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ cod_dup_list(sm_list list) 
%token <info> string_constant

%token <info> floating_constant

%token <info> identifier_ref

%token <info> type_id

%token <info> type_identifier

%token <info> enumeration_constant



%type <info> struct_or_union;
@@ -1031,7 +1031,7 @@ type_specifier: 
	    $$->node.type_specifier.lx_srcpos = $1.lx_srcpos;

	    $$->node.type_specifier.token = STRING;

	}

	| type_id {

	| type_identifier {

	    $$ = cod_new_identifier();

	    $$->node.identifier.lx_srcpos = $1.lx_srcpos;

	    $$->node.identifier.id = $1.string;

thirdparty/ffs/ffs/cod/pregen_source/Linux/cod.l

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ return {RETURN(RETURN_TOKEN);} 
[A-Za-z_][A-Za-z0-9_]*	{

				yylval.info.string = create_string_from_yytext();

				if (is_defined_type(yylval.info.string)) {

				    RETURN(type_id);

				    RETURN(type_identifier);

				} else if (is_enumeration_constant(yylval.info.string)) {

				    RETURN(enumeration_constant);

				} else {

thirdparty/ffs/ffs/cod/pregen_source/Linux/cod.tab.c

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
     string_constant = 335,

     floating_constant = 336,

     identifier_ref = 337,

     type_id = 338,

     type_identifier = 338,

     enumeration_constant = 339

   };

#endif
@@ -231,7 +231,7 @@ 
#define string_constant 335

#define floating_constant 336

#define identifier_ref 337

#define type_id 338

#define type_identifier 338

#define enumeration_constant 339
@@ -877,7 +877,7 @@ static const char *const yytname[] = 
  "STATIC", "EXTERN_TOKEN", "STRUCT", "ENUM", "UNION", "CONST", "SIZEOF",

  "TYPEDEF", "RETURN_TOKEN", "CONTINUE", "BREAK", "GOTO", "PRINT", "COMMA",

  "DOTDOTDOT", "integer_constant", "character_constant", "string_constant",

  "floating_constant", "identifier_ref", "type_id", "enumeration_constant",

  "floating_constant", "identifier_ref", "type_identifier", "enumeration_constant",

  "$accept", "start", "primary_expression", "postfix_expression",

  "argument_expression_list", "unary_expression", "unary_operator",

  "cast_expression", "multiplicative_expression", "additive_expression",

thirdparty/ffs/ffs/cod/pregen_source/Linux/cod.tab.h

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
     string_constant = 335,

     floating_constant = 336,

     identifier_ref = 337,

     type_id = 338,

     type_identifier = 338,

     enumeration_constant = 339

   };

#endif
@@ -204,7 +204,7 @@ 
#define string_constant 335

#define floating_constant 336

#define identifier_ref 337

#define type_id 338

#define type_identifier 338

#define enumeration_constant 339