/[CvsGraph]/cvsgraph/confl.l
ViewVC logotype

Diff of /cvsgraph/confl.l

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.4, Sun Mar 4 01:38:23 2001 UTC revision 1.5, Sun Mar 4 03:19:18 2001 UTC
# Line 78  Line 78 
78  image_type              return tIMAGE_TYPE;  image_type              return tIMAGE_TYPE;
79  image_quality           return tIMAGE_QUALITY;  image_quality           return tIMAGE_QUALITY;
80  map_name                return tMAP_NAME;  map_name                return tMAP_NAME;
81  map_branch              return tMAP_BRANCH;  map_branch_href         return tMAP_BRANCH_HREF;
82  map_rev                 return tMAP_REV;  map_branch_alt          return tMAP_BRANCH_ALT;
83    map_rev_href            return tMAP_REV_HREF;
84    map_rev_alt             return tMAP_REV_ALT;
85    
86  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;
87  png                     yylval.num = IMAGE_PNG; return tNUMBER;  png                     yylval.num = IMAGE_PNG; return tNUMBER;
# Line 127  Line 129 
129  <STR>\\[012][0-7]{0,2}          { char ch = strtol(yytext+1, NULL, 8); add_str(&ch, 1); }  <STR>\\[012][0-7]{0,2}          { char ch = strtol(yytext+1, NULL, 8); add_str(&ch, 1); }
130  <STR>\\[xX][a-fA-F0-9]{2}       { char ch = strtol(yytext+1, NULL, 8); add_str(&ch, 1); }  <STR>\\[xX][a-fA-F0-9]{2}       { char ch = strtol(yytext+1, NULL, 8); add_str(&ch, 1); }
131  <STR>\\[xX][a-fA-F0-9]  yyerror("Invalid hex escape");  <STR>\\[xX][a-fA-F0-9]  yyerror("Invalid hex escape");
132  <STR>\\.                add_str(yytext, yyleng);  <STR>\\.                add_str(yytext+1, 1);
133  <STR>\n                 yyerror("Newline in string");  <STR>\n                 yyerror("Newline in string");
134  <STR>\"                 yylval.str = get_str(); BEGIN(INITIAL); return tSTRING;  <STR>\"                 yylval.str = get_str(); BEGIN(INITIAL); return tSTRING;
135    

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

  ViewVC Help
Powered by ViewVC 1.1.0 with CvsGraph 1.7.0