andrius
/
M2-Planet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed ARM build issue

This commit is contained in:
Jeremiah Orians 2018-07-21 12:45:19 -04:00
parent dc94afb558
commit 95fa0de49f
No known key found for this signature in database
GPG Key ID: 7457821534D2ACCD
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.org
View File

@ -40,6 +40,7 @@ Correct bug in how \" is treated
Clean up of & when && should have been used Clean up of & when && should have been used
Made test22 for consistent Made test22 for consistent
Fixed !c->a regression Fixed !c->a regression
Fixed ARM platform build
** Removed ** Removed
Removed need for string copying in M2-Planet Removed need for string copying in M2-Planet

12
cc_reader.c
View File

@ -21,7 +21,7 @@ struct token_list* token;
int line; int line;
char* file; char* file;
char clearWhiteSpace(char c) int clearWhiteSpace(int c)
{ {
if((32 == c) || (9 == c)) return clearWhiteSpace(fgetc(input)); if((32 == c) || (9 == c)) return clearWhiteSpace(fgetc(input));
else if (10 == c) else if (10 == c)
@ -33,14 +33,14 @@ char clearWhiteSpace(char c)
} }
int string_index; int string_index;
char consume_byte(struct token_list* current, char c) int consume_byte(struct token_list* current, int c)
{ {
current->s[string_index] = c; current->s[string_index] = c;
string_index = string_index + 1; string_index = string_index + 1;
return fgetc(input); return fgetc(input);
} }
char consume_word(struct token_list* current, char c, char frequent) int consume_word(struct token_list* current, int c, int frequent)
{ {
int escape = FALSE; int escape = FALSE;
do do
@ -67,7 +67,7 @@ void fixup_label(struct token_list* current)
} while(0 != hold); } while(0 != hold);
} }
char preserve_keyword(struct token_list* current, char c) int preserve_keyword(struct token_list* current, int c)
{ {
while((('a' <= c) & (c <= 'z')) | (('A' <= c) & (c <= 'Z')) | (('0' <= c) & (c <= '9')) | (c == '_')) while((('a' <= c) & (c <= 'z')) | (('A' <= c) & (c <= 'Z')) | (('0' <= c) & (c <= '9')) | (c == '_'))
{ {
@ -81,7 +81,7 @@ char preserve_keyword(struct token_list* current, char c)
return c; return c;
} }
char preserve_symbol(struct token_list* current, char c) int preserve_symbol(struct token_list* current, int c)
{ {
while((c == '<') | (c == '=') | (c == '>') | (c == '|') | (c == '&') | (c == '!') | (c == '-')) while((c == '<') | (c == '=') | (c == '>') | (c == '|') | (c == '&') | (c == '!') | (c == '-'))
{ {
@ -90,7 +90,7 @@ char preserve_symbol(struct token_list* current, char c)
return c; return c;
} }
char purge_macro(int ch) int purge_macro(int ch)
{ {
while(10 != ch) ch = fgetc(input); while(10 != ch) ch = fgetc(input);
return ch; return ch;