Add support for parsing English-like declarations.

[cdecl99.git] / src / scan.l

diff --git a/src/scan.l b/src/scan.l
index 75657fbde11e40a3103b65f776cdfb374fcb960f..bb6564b7d214be4c82b12d89885959cf9afae147 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -17,23 +17,41 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
- #include "parse.h"
+#include "parse.h"
 }
 
 %option noyywrap bison-locations reentrant
+%option extra-type="_Bool"
 
 %{
 #define lex_error(msg) do { \
        yyerror(yylloc, NULL, NULL, (msg)); \
        return T_LEX_ERROR; \
 } while(0)
+
+#define dup_token() do { \
+       yylval->strval = malloc(yyleng+1); \
+       if (!yylval->strval) \
+               lex_error("failed to allocate memory"); \
+       strcpy(yylval->strval, yytext); \
+} while(0)
 %}
 
+%s ENGLISH
+
 IDENT [_[:alpha:]][_[:alnum:]]*
 INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
 
 %%
 
+%{
+       if (yyextra) {
+               yyextra = 0;
+               BEGIN(ENGLISH);
+               return T_ENGLISH;
+       }
+%}
+
 "..." return T_ELLIPSIS;
 ";"   return T_SEMICOLON;
 "*"   return T_ASTERISK;
@@ -85,15 +103,21 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
        return T_UINT;
 }
 
-{IDENT} {
-       yylval->strval = malloc(yyleng+1);
-       if (!yylval->strval)
-               lex_error("failed to allocate memory");
-
-       strcpy(yylval->strval, yytext);
-       return T_IDENT;
+<ENGLISH>{
+       "variable-length" return T_VLA;
+       "type"            return T_TYPE;
+       "declare"         return T_DECLARE;
+       "pointer"         return T_POINTER;
+       "function"        return T_FUNCTION;
+       "returning"       return T_RETURNING;
+       "array"           return T_ARRAY;
+       "to"              return T_TO;
+       "of"              return T_OF;
+       "as"              return T_AS;
 }
 
+{IDENT} { dup_token(); return T_IDENT; }
+
 [[:space:]]+
 . {
        char buf[] = "syntax error, unexpected #";