← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring

« back to all changes in this revision

Viewing changes to src/glsl/glcpp/glcpp-lex.l

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-01-22 11:54:09 UTC
  • mfrom: (1.7.13)
  • Revision ID: package-import@ubuntu.com-20130122115409-5e9xii2ee1whab3e
Tags: 9.0.2-0ubuntu1
* New upstream release.
* Decrease size of mesa's libgl1-mesa-dri again
  - re-enable 117-static-gallium.patch
  - add 118-dricore-gallium.patch to link against libdricore again

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glsl/glcpp/glcpp-lex.l
67
67
%option stack
68
68
%option never-interactive
69
69
 
70
 
%x DONE COMMENT UNREACHABLE SKIP
 
70
%x DONE COMMENT UNREACHABLE SKIP DEFINE
71
71
 
72
72
SPACE           [[:space:]]
73
73
NONSPACE        [^[:space:]]
184
184
        glcpp_error(yylloc, yyextra, "#error%s", p);
185
185
}
186
186
 
187
 
{HASH}define{HSPACE}+/{IDENTIFIER}"(" {
188
 
        yyextra->space_tokens = 0;
189
 
        return HASH_DEFINE_FUNC;
190
 
}
191
 
 
192
 
{HASH}define {
193
 
        yyextra->space_tokens = 0;
194
 
        return HASH_DEFINE_OBJ;
 
187
{HASH}define{HSPACE}+ {
 
188
        yyextra->space_tokens = 0;
 
189
        yy_push_state(DEFINE, yyscanner);
 
190
        return HASH_DEFINE;
 
191
}
 
192
 
 
193
<DEFINE>{IDENTIFIER}/"(" {
 
194
        yy_pop_state(yyscanner);
 
195
        yylval->str = ralloc_strdup (yyextra, yytext);
 
196
        return FUNC_IDENTIFIER;
 
197
}
 
198
 
 
199
<DEFINE>{IDENTIFIER} {
 
200
        yy_pop_state(yyscanner);
 
201
        yylval->str = ralloc_strdup (yyextra, yytext);
 
202
        return OBJ_IDENTIFIER;
195
203
}
196
204
 
197
205
{HASH}undef {