diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2014-10-17 08:17:49 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2014-10-17 08:17:49 -0700 |
commit | 9f158a44b7e88c1dcfb8d56f4f85d642fc423b59 (patch) | |
tree | 336dc9997f047c3ea954312b3dbc715157de0b67 /parser.l | |
parent | 499f04dc4f9f864071d6ff7e75c9cbec60e2fd12 (diff) | |
download | txr-9f158a44b7e88c1dcfb8d56f4f85d642fc423b59.tar.gz txr-9f158a44b7e88c1dcfb8d56f4f85d642fc423b59.tar.bz2 txr-9f158a44b7e88c1dcfb8d56f4f85d642fc423b59.zip |
Purge stray occurrences of "void *" from code base.
* lib.c (cobj_print_op): In the format call, cast
the C pointer to val, since the ~p conversion now
takes a val rather than void *.
(cptr_equal_op, obj_print, obj_pprint): Remove cast to
void *, since obj now already has the type that ~p expects.
* lib.h (struct any): Use mem_t * instead of void *.
* parser.h (yyscan_t): Repeat the definition from inside
the Flex-generated lex.yy.c.
(yylex_init, yylex_destroy, yyget_extra, yyset_extra): Re-declare
using yyscan_t typedef in place of void *.
* parser.l (yyget_column, yyerrprepf): Re-declare using yyscan_t.
(grammar): Use yyg in place of yyscanner in calls to yyerrprepf.
* parser.y (yylex, %lex-param): Use yyscan_t instead of void *.
(parse): Use yyscan_t for local variable.
* signal.c (stack): Change type from void * to mem_t *.
* stream.c (vformat): Conversion specifier p extracts val
instead of void *.
(run): Use casts that only remove const, not all the way to void *.
* txr.1: Documented p conversion specifier of format.
* Makefile (OBJS-y): Initialize with := to make sure it is a
simple variable, and not a macro.
(SRCS): New variable, listing source files.
(enforce): New rule for enforcing coding conventions.
Currently checks for void * occurrences.
Diffstat (limited to 'parser.l')
-rw-r--r-- | parser.l | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -75,8 +75,8 @@ int yylex_destroy(void) #endif /* Missing prototypes not generated by flex. */ -int yyget_column(void *); -void yyset_column (int column_no , yyscan_t yyscanner); +int yyget_column(yyscan_t); +void yyset_column (int column_no, yyscan_t yyscanner); void yyerror(scanner_t *scanner, parser_t *parser, const char *s) { @@ -103,7 +103,7 @@ void yyerrorf(scanner_t *scanner, val fmt, ...) parser->errors++; } -static void yyerrprepf(void *scanner, val fmt, ...) +static void yyerrprepf(scanner_t *scanner, val fmt, ...) { parser_t *parser = yyget_extra(scanner); @@ -689,13 +689,13 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} } <SPECIAL,QSPECIAL,NESTED,BRACED>{UANYN} { - yyerrprepf(yyscanner, lit("bad character in directive: '~a'"), + yyerrprepf(yyg, lit("bad character in directive: '~a'"), string_utf8(yytext), nao); return ERRTOK; } <SPECIAL,QSPECIAL,NESTED,BRACED>. { - yyerrprepf(yyscanner, lit("non-UTF-8 byte in directive: '\\x~02x'"), + yyerrprepf(yyg, lit("non-UTF-8 byte in directive: '\\x~02x'"), num((unsigned char) yytext[0]), nao); return ERRTOK; } @@ -727,7 +727,7 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} <REGEX>\n { yyextra->lineno++; - yyerrprepf(yyscanner, lit("newline in regex"), nao); + yyerrprepf(yyg, lit("newline in regex"), nao); return ERRTOK; } @@ -752,7 +752,7 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} } <REGEX>[\\] { - yyerrprepf(yyscanner, lit("dangling backslash in regex"), nao); + yyerrprepf(yyg, lit("dangling backslash in regex"), nao); return ERRTOK; } @@ -764,7 +764,7 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} } <REGEX>. { - yyerrprepf(yyscanner, lit("non-UTF-8 byte in regex: '\\x~02x'"), + yyerrprepf(yyg, lit("non-UTF-8 byte in regex: '\\x~02x'"), num((unsigned char) yytext[0]), nao); return ERRTOK; } @@ -857,21 +857,21 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} } <STRLIT>\n { - yyerrprepf(yyscanner, lit("newline in string literal"), nao); + yyerrprepf(yyg, lit("newline in string literal"), nao); yyextra->lineno++; yylval->chr = yytext[0]; return ERRTOK; } <CHRLIT>\n { - yyerrprepf(yyscanner, lit("newline in character literal"), nao); + yyerrprepf(yyg, lit("newline in character literal"), nao); yyextra->lineno++; yylval->chr = yytext[0]; return ERRTOK; } <QSILIT>\n { - yyerrprepf(yyscanner, lit("newline in string quasiliteral"), nao); + yyerrprepf(yyg, lit("newline in string quasiliteral"), nao); yyextra->lineno++; yylval->chr = yytext[0]; return ERRTOK; @@ -898,7 +898,7 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U} } <STRLIT,CHRLIT,QSILIT,WLIT,QWLIT>. { - yyerrprepf(yyscanner, lit("non-UTF-8 byte in literal: '\\x~02x'"), + yyerrprepf(yyg, lit("non-UTF-8 byte in literal: '\\x~02x'"), num((unsigned char) yytext[0]), nao); return ERRTOK; } |