Date: Tue, 23 Jun 2009 08:15:03 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 164944 for review Message-ID: <200906230815.n5N8F3Ke057329@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164944 Change 164944 by gabor@gabor_server on 2009/06/23 08:14:03 - style(9) Affected files ... .. //depot/projects/soc2008/gabor_textproc/bc/bc.y#4 edit .. //depot/projects/soc2008/gabor_textproc/bc/extern.h#3 edit .. //depot/projects/soc2008/gabor_textproc/bc/scan.l#3 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/bc/bc.y#4 (text+ko) ==== @@ -67,54 +67,54 @@ } u; }; -int yyparse(void); -int yywrap(void); +int yyparse(void); +int yywrap(void); -int fileindex; -int sargc; +int fileindex; +int sargc; const char **sargv; const char *filename; char *cmdexpr; -static void grow(void); -static ssize_t cs(const char *); -static ssize_t as(const char *); -static ssize_t node(ssize_t, ...); -static void emit(ssize_t); -static void emit_macro(int, ssize_t); -static void free_tree(void); -static ssize_t numnode(int); -static ssize_t lookup(char *, size_t, char); -static ssize_t letter_node(char *); -static ssize_t array_node(char *); -static ssize_t function_node(char *); +static void grow(void); +static ssize_t cs(const char *); +static ssize_t as(const char *); +static ssize_t node(ssize_t, ...); +static void emit(ssize_t); +static void emit_macro(int, ssize_t); +static void free_tree(void); +static ssize_t numnode(int); +static ssize_t lookup(char *, size_t, char); +static ssize_t letter_node(char *); +static ssize_t array_node(char *); +static ssize_t function_node(char *); -static void add_par(ssize_t); -static void add_local(ssize_t); -static void warning(const char *); -static void init(void); -static void usage(void); +static void add_par(ssize_t); +static void add_local(ssize_t); +static void warning(const char *); +static void init(void); +static void usage(void); static char *escape(const char *); -static ssize_t instr_sz = 0; +static ssize_t instr_sz = 0; static struct tree *instructions = NULL; -static ssize_t current = 0; -static int macro_char = '0'; -static int reset_macro_char = '0'; -static int nesting = 0; -static int breakstack[16]; -static int breaksp = 0; -static ssize_t prologue; -static ssize_t epilogue; -static bool st_has_continue; -static char str_table[UCHAR_MAX][2]; -static bool do_fork = true; -static u_short var_count; -static pid_t dc; +static ssize_t current = 0; +static int macro_char = '0'; +static int reset_macro_char = '0'; +static int nesting = 0; +static int breakstack[16]; +static int breaksp = 0; +static ssize_t prologue; +static ssize_t epilogue; +static bool st_has_continue; +static char str_table[UCHAR_MAX][2]; +static bool do_fork = true; +static u_short var_count; +static pid_t dc; -static void sigchld(int); +static void sigchld(int); -extern char *__progname; +extern char *__progname; #define BREAKSTACK_SZ (sizeof(breakstack)/sizeof(breakstack[0])) @@ -144,8 +144,8 @@ %start program %union { - ssize_t node; - struct lvalue lvalue; + ssize_t node; + struct lvalue lvalue; const char *str; char *astr; } @@ -300,7 +300,7 @@ } | QUIT { - sigset_t mask; + sigset_t mask; putchar('q'); fflush(stdout); @@ -322,7 +322,7 @@ opt_relational_expression SEMICOLON opt_expression RPAR opt_statement pop_nesting { - ssize_t n; + ssize_t n; if (st_has_continue) n = node($10, cs("M"), $8, cs("s."), @@ -352,7 +352,7 @@ | WHILE LPAR alloc_macro relational_expression RPAR opt_statement pop_nesting { - ssize_t n; + ssize_t n; if (st_has_continue) n = node($6, cs("M"), $4, $3, END_NODE); @@ -768,7 +768,7 @@ grow(void) { struct tree *p; - size_t newsize; + size_t newsize; if (current == instr_sz) { newsize = instr_sz * 2 + 1; @@ -788,7 +788,7 @@ grow(); instructions[current].index = CONST_STRING; instructions[current].u.cstr = str; - return current++; + return (current++); } static ssize_t @@ -799,14 +799,14 @@ instructions[current].u.astr = strdup(str); if (instructions[current].u.astr == NULL) err(1, NULL); - return current++; + return (current++); } static ssize_t node(ssize_t arg, ...) { - va_list ap; - ssize_t ret; + va_list ap; + ssize_t ret; va_start(ap, arg); @@ -821,7 +821,7 @@ } while (arg != END_NODE); va_end(ap); - return ret; + return (ret); } static void @@ -846,7 +846,7 @@ static void free_tree(void) { - ssize_t i; + ssize_t i; for (i = 0; i < current; i++) if (instructions[i].index == ALLOC_STRING) @@ -857,7 +857,7 @@ static ssize_t numnode(int num) { - const char *p; + const char *p; if (num < 10) p = str_table['0' + num]; @@ -865,16 +865,16 @@ p = str_table['A' - 10 + num]; else errx(1, "internal error: break num > 15"); - return node(cs(" "), cs(p), END_NODE); + return (node(cs(" "), cs(p), END_NODE)); } static ssize_t lookup(char * str, size_t len, char type) { - ENTRY entry, *found; - u_short num; - u_char *p; + ENTRY entry, *found; + u_short num; + u_char *p; /* The scanner allocated an extra byte already */ if (str[len-1] != type) { @@ -903,43 +903,43 @@ if (found == NULL) err(1, NULL); } - return cs(found->data); + return (cs(found->data)); } static ssize_t letter_node(char *str) { - size_t len; + size_t len; len = strlen(str); if (len == 1 && str[0] != '_') - return cs(str_table[(int)str[0]]); + return (cs(str_table[(int)str[0]])); else - return lookup(str, len, 'L'); + return (lookup(str, len, 'L')); } static ssize_t array_node(char *str) { - size_t len; + size_t len; len = strlen(str); if (len == 1 && str[0] != '_') - return cs(str_table[(int)str[0] - 'a' + ARRAY_CHAR]); + return (cs(str_table[(int)str[0] - 'a' + ARRAY_CHAR])); else - return lookup(str, len, 'A'); + return (lookup(str, len, 'A')); } static ssize_t function_node(char *str) { - size_t len; + size_t len; len = strlen(str); if (len == 1 && str[0] != '_') - return cs(str_table[(int)str[0] - 'a' + FUNC_CHAR]); + return (cs(str_table[(int)str[0] - 'a' + FUNC_CHAR])); else - return lookup(str, len, 'F'); + return (lookup(str, len, 'F')); } static void @@ -960,7 +960,7 @@ yyerror(const char *s) { char *str, *p; - int n; + int n; if (yyin != NULL && feof(yyin)) n = asprintf(&str, "%s: %s:%d: %s: unexpected EOF", @@ -1000,7 +1000,7 @@ static void init(void) { - unsigned int i; + unsigned int i; for (i = 0; i < UCHAR_MAX; i++) { str_table[i][0] = i; @@ -1022,7 +1022,7 @@ static char * escape(const char *str) { - char *ret, *p; + char *ret, *p; ret = malloc(strlen(str) + 1); if (ret == NULL) @@ -1071,15 +1071,15 @@ *p++ = *str++; } *p = '\0'; - return ret; + return (ret); } /* ARGSUSED */ void sigchld(int signo) { - pid_t pid; - int status; + pid_t pid; + int status; switch (signo) { default: @@ -1101,8 +1101,8 @@ int main(int argc, char *argv[]) { - int i, ch; - int p[2]; + int i, ch; + int p[2]; char *q; init(); @@ -1175,5 +1175,5 @@ } } yywrap(); - return yyparse(); + return (yyparse()); } ==== //depot/projects/soc2008/gabor_textproc/bc/extern.h#3 (text+ko) ==== @@ -20,19 +20,19 @@ #include <stdio.h> struct lvalue { - ssize_t load; - ssize_t store; + ssize_t load; + ssize_t store; }; -int yylex(void); -void yyerror(const char *); -void fatal(const char *); -void abort_line(int); +int yylex(void); +void yyerror(const char *); +void fatal(const char *); +void abort_line(int); -extern int lineno; -extern int fileindex; -extern int sargc; +extern int lineno; +extern int fileindex; +extern int sargc; extern const char **sargv; extern const char *filename; extern char *cmdexpr; -bool interactive; +bool interactive; ==== //depot/projects/soc2008/gabor_textproc/bc/scan.l#3 (text+ko) ==== @@ -31,14 +31,14 @@ #include "bc.h" #include "pathnames.h" -int lineno; +int lineno; static char *strbuf = NULL; -static size_t strbuf_sz = 1; -static bool dot_seen; +static size_t strbuf_sz = 1; +static bool dot_seen; -static void init_strbuf(void); -static void add_str(const char *); +static void init_strbuf(void); +static void add_str(const char *); %} @@ -91,7 +91,7 @@ BEGIN(INITIAL); yylval.str = strbuf; unput('.'); - return NUMBER; + return (NUMBER); } else { dot_seen = true; add_str("."); @@ -102,73 +102,73 @@ BEGIN(INITIAL); unput(yytext[0]); if (strcmp(strbuf, ".") == 0) - return DOT; + return (DOT); else { yylval.str = strbuf; - return NUMBER; + return (NUMBER); } } } -"auto" return AUTO; -"break" return BREAK; -"continue" return CONTINUE; -"define" return DEFINE; -"else" return ELSE; -"ibase" return IBASE; -"if" return IF; -"last" return DOT; -"for" return FOR; -"length" return LENGTH; -"obase" return OBASE; -"print" return PRINT; -"quit" return QUIT; -"return" return RETURN; -"scale" return SCALE; -"sqrt" return SQRT; -"while" return WHILE; +"auto" return (AUTO); +"break" return (BREAK); +"continue" return (CONTINUE); +"define" return (DEFINE); +"else" return (ELSE); +"ibase" return (IBASE); +"if" return (IF); +"last" return (DOT); +"for" return (FOR); +"length" return (LENGTH); +"obase" return (OBASE); +"print" return (PRINT); +"quit" return (QUIT); +"return" return (RETURN); +"scale" return (SCALE); +"sqrt" return (SQRT); +"while" return (WHILE); -"^" return EXPONENT; -"*" return MULTIPLY; -"/" return DIVIDE; -"%" return REMAINDER; +"^" return (EXPONENT); +"*" return (MULTIPLY); +"/" return (DIVIDE); +"%" return (REMAINDER); -"!" return BOOL_NOT; -"&&" return BOOL_AND; -"||" return BOOL_OR; +"!" return (BOOL_NOT); +"&&" return (BOOL_AND); +"||" return (BOOL_OR); -"+" return PLUS; -"-" return MINUS; +"+" return (PLUS); +"-" return (MINUS); -"++" return INCR; -"--" return DECR; +"++" return (INCR); +"--" return (DECR); -"=" yylval.str = ""; return ASSIGN_OP; -"+=" yylval.str = "+"; return ASSIGN_OP; -"-=" yylval.str = "-"; return ASSIGN_OP; -"*=" yylval.str = "*"; return ASSIGN_OP; -"/=" yylval.str = "/"; return ASSIGN_OP; -"%=" yylval.str = "%"; return ASSIGN_OP; -"^=" yylval.str = "^"; return ASSIGN_OP; +"=" yylval.str = ""; return (ASSIGN_OP); +"+=" yylval.str = "+"; return (ASSIGN_OP); +"-=" yylval.str = "-"; return (ASSIGN_OP); +"*=" yylval.str = "*"; return (ASSIGN_OP); +"/=" yylval.str = "/"; return (ASSIGN_OP); +"%=" yylval.str = "%"; return (ASSIGN_OP); +"^=" yylval.str = "^"; return (ASSIGN_OP); -"==" return EQUALS; -"<=" return LESS_EQ; -">=" return GREATER_EQ; -"!=" return UNEQUALS; -"<" return LESS; -">" return GREATER; +"==" return (EQUALS); +"<=" return (LESS_EQ); +">=" return (GREATER_EQ); +"!=" return (UNEQUALS); +"<" return (LESS); +">" return (GREATER); -"," return COMMA; -";" return SEMICOLON; +"," return (COMMA); +";" return (SEMICOLON); -"(" return LPAR; -")" return RPAR; +"(" return (LPAR); +")" return (RPAR); -"[" return LBRACKET; -"]" return RBRACKET; +"[" return (LBRACKET); +"]" return (RBRACKET); -"{" return LBRACE; -"}" return RBRACE; +"{" return (LBRACE); +"}" return (RBRACE); {ALPHA}{ALPHANUM}* { /* alloc an extra byte for the type marker */ @@ -177,15 +177,15 @@ err(1, NULL); strlcpy(p, yytext, yyleng + 1); yylval.astr = p; - return LETTER; + return (LETTER); } \\\n lineno++; -\n lineno++; return NEWLINE; +\n lineno++; return (NEWLINE); #[^\n]* ; [ \t] ; -<<EOF>> return QUIT; +<<EOF>> return (QUIT); . yyerror("illegal character"); %% @@ -204,13 +204,13 @@ static void add_str(const char *str) { - size_t arglen; + size_t arglen; arglen = strlen(str); if (strlen(strbuf) + arglen + 1 > strbuf_sz) { - size_t newsize; - char *p; + size_t newsize; + char *p; newsize = strbuf_sz + arglen + 1; p = realloc(strbuf, newsize); @@ -228,8 +228,8 @@ void abort_line(int sig) { - static const char str[] = "[\n]P\n"; - int save_errno; + static const char str[] = "[\n]P\n"; + int save_errno; switch (sig) { default: @@ -243,8 +243,8 @@ int yywrap(void) { - static int state; - static YY_BUFFER_STATE buf; + static int state; + static YY_BUFFER_STATE buf; if (fileindex == 0 && sargc > 0 && strcmp(sargv[0], _PATH_LIBB) == 0) { filename = sargv[fileindex++];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906230815.n5N8F3Ke057329>