Author: paultcochrane
Date: Sat Mar 31 06:15:19 2007
New Revision: 17892
Modified:
trunk/compilers/pirc/src/pirlexer.c
trunk/compilers/pirc/src/pirparser.c
Log:
[pirc] Fixed parentheses as per coding standards
Patch courtesy of Shawn M Moore <sartak at gmail dot com>
Modified: trunk/compilers/pirc/src/pirlexer.c
==============================================================================
--- trunk/compilers/pirc/src/pirlexer.c (original)
+++ trunk/compilers/pirc/src/pirlexer.c Sat Mar 31 06:15:19 2007
@@ -688,7 +688,7 @@
int index = 0;
char const * word = dictionary[index];
/* check all words in dictionary; if equal, return its token enum value */
- while(word) {
+ while (word) {
if (strcmp(word, lexer->token_chars) == 0) return index;
word = dictionary[++index];
}
@@ -917,7 +917,7 @@
* of the string - is returned
*/
dest = ptr = (char *)calloc(srclen + 1, sizeof(char));
- while(*src) {
+ while (*src) {
*dest++ = *src++;
}
return ptr;
@@ -1057,7 +1057,7 @@
*/
/* now start checking for real tokens */
- switch(c) {
+ switch (c) {
case 'P':
buffer_char(lexer, c); /* buffer 'P'
*/
count = read_digits(lexer); /* read as many digits as
you can */
@@ -1253,7 +1253,7 @@
c = read_char(lexer->curfile);
if (c == EOF_MARKER) return T_EOF;
- switch(c) {
+ switch (c) {
case 'P': regtype = T_PREG; break;
case 'N': regtype = T_NREG; break;
case 'S': regtype = T_SREG; break;
@@ -1302,7 +1302,7 @@
=cut
*/
- switch(c) {
+ switch (c) {
case '(': buffer_char(lexer, c); return T_LPAREN;
case ')': buffer_char(lexer, c); return T_RPAREN;
case '[': buffer_char(lexer, c); return T_LBRACKET;
@@ -1348,7 +1348,7 @@
/* check for possible multi-character special tokens */
if (c == '*') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '*': return T_POWER; /* *= */
case '=': return T_POWER_ASSIGN; /* **= */
case EOF_MARKER: return T_EOF;
@@ -1359,7 +1359,7 @@
}
else if (c == '%') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '=': return T_MODULO_ASSIGN; /* %= */
case EOF_MARKER: return T_EOF;
default:
@@ -1369,7 +1369,7 @@
}
else if (c == '/') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '/':
c = read_char(lexer->curfile);
if (c == '=') {
@@ -1389,7 +1389,7 @@
}
else if (c == '+') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '=': return T_PLUS_ASSIGN; /* += */
case EOF_MARKER: return T_EOF;
default:
@@ -1399,7 +1399,7 @@
}
else if (c == '-') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '>': return T_PTR; /* -> */
case '=': return T_MINUS_ASSIGN; /* -= */
case EOF_MARKER: return T_EOF;
@@ -1410,7 +1410,7 @@
}
else if (c == '!') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '=': return T_NE; /* != */
case EOF_MARKER: return T_EOF;
default: /* ! */
@@ -1420,7 +1420,7 @@
}
else if (c == '=') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '>': return T_ARROW; /* => */
case '=': return T_EQ; /* == */
case EOF_MARKER: return T_EOF;
@@ -1431,7 +1431,7 @@
}
else if (c == '>') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '>':
c = read_char(lexer->curfile);
if (c == '>') { /* >>> */
@@ -1460,7 +1460,7 @@
}
else if (c == '<') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '=': return T_LE; /* <= */
case '<': /* <<? */
c = read_char(lexer->curfile);
@@ -1491,7 +1491,7 @@
}
else if (c == '~') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '~': return T_XOR; /* ~~ */
case '=': return T_BXOR_ASSIGN; /* ~= */
case EOF_MARKER: return T_EOF;
@@ -1502,7 +1502,7 @@
}
else if (c == '&') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '&': return T_AND; /* && */
case '=': return T_BAND_ASSIGN; /* &= */
case EOF_MARKER: return T_EOF;
@@ -1513,7 +1513,7 @@
}
else if (c == '|') {
c = read_char(lexer->curfile);
- switch(c) {
+ switch (c) {
case '|': return T_OR; /* || */
case '=': return T_BOR_ASSIGN; /* |= */
case EOF_MARKER: return T_EOF;
Modified: trunk/compilers/pirc/src/pirparser.c
==============================================================================
--- trunk/compilers/pirc/src/pirparser.c (original)
+++ trunk/compilers/pirc/src/pirparser.c Sat Mar 31 06:15:19 2007
@@ -403,7 +403,7 @@
*/
static void
target(parser_state *p) {
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_PASM_PREG: case T_PREG: case T_PASM_IREG: case T_IREG:
case T_PASM_NREG: case T_NREG: case T_PASM_SREG: case T_SREG:
case T_IDENTIFIER:
@@ -426,7 +426,7 @@
*/
static void
type(parser_state *p) {
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_INT:
case T_NUM:
case T_PMC:
@@ -481,7 +481,7 @@
keylist(parser_state *p) {
match(p, T_LBRACKET); /* skip '[' */
key(p);
- while(p->curtoken == T_SEMICOLON || p->curtoken == T_COMMA) {
+ while (p->curtoken == T_SEMICOLON || p->curtoken == T_COMMA) {
next(p); /* skip ';' or ',' */
key(p);
}
@@ -626,7 +626,7 @@
*/
static void
arith_expression(parser_state *p) {
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_PLUS:
case T_MINUS:
case T_DIVIDE:
@@ -708,7 +708,7 @@
assignment(parser_state *p) {
match(p, T_ASSIGN);
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_NOT:
case T_MINUS:
case T_BXOR: /* '~' used as binary 'not' op */
@@ -881,7 +881,7 @@
match(p, T_IDENTIFIER);
if (p->curtoken == T_UNIQUE_REG_FLAG) next(p);
- while(p->curtoken == T_COMMA) {
+ while (p->curtoken == T_COMMA) {
next(p); /* skip comma */
match(p, T_IDENTIFIER);
@@ -974,7 +974,7 @@
conditional_expression(parser_state *p) {
expression(p);
- switch(p->curtoken) { /* optional */
+ switch (p->curtoken) { /* optional */
case T_GE: case T_GT: case T_EQ:
case T_NE: case T_LT: case T_LE:
next(p); /* skip comparison op */
@@ -1048,7 +1048,7 @@
*/
static void
const_definition(parser_state *p) {
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_INT:
next(p);
match(p, T_IDENTIFIER);
@@ -1149,7 +1149,7 @@
int ok = 1;
while (ok) {
/* if the current token is a flag, parse it */
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_SLURPY_FLAG:
case T_UNIQUE_REG_FLAG:
case T_OPTIONAL_FLAG:
@@ -1206,7 +1206,7 @@
match(p, T_NEWLINE);
}
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_PCC_CALL: /* ... '.pcc_call' target '\n' ... */
case T_NCI_CALL: /* ... '.nci_call' target '\n' ... */
next(p);
@@ -1302,7 +1302,7 @@
target_statement(parser_state *p) {
target(p);
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_ASSIGN: /* target '=' expression */
assignment(p);
break;
@@ -1358,7 +1358,7 @@
target_list(parser_state *p) {
match(p, T_LPAREN);
target(p);
- while(p->curtoken == T_COMMA) {
+ while (p->curtoken == T_COMMA) {
next(p);
target(p);
param_flags(p);
@@ -1380,7 +1380,7 @@
target_list(p);
match(p, T_ASSIGN);
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_IDENTIFIER: /* target_list '=' subcall */
case T_PASM_PREG:
case T_PREG:
@@ -1691,7 +1691,7 @@
int wantmore = 0; /* flag that is set when a ',' is parsed */
while (ok || wantmore) {
- switch(p->curtoken) {
+ switch (p->curtoken) {
case T_ANON_FLAG:
case T_INIT_FLAG:
case T_LOAD_FLAG:
