Chiebot-Mirror
/
yasm
mirror of https://github.com/yasm/yasm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed some warnings.

Browse Source 
The wussy way, cause i didn't comment any of the new prototypes.

svn path=/trunk/yasm/; revision=486
0.3
Michael Urman 23 years ago
parent 7c073b5c23
commit 4818dbe555
4 changed files with 66 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      modules/preprocs/yapp/yapp-preproc.c
  2. 2
      modules/preprocs/yapp/yapp-token.h
  3. 39
      src/preprocs/yapp/yapp-preproc.c
  4. 2
      src/preprocs/yapp/yapp-token.h

39
modules/preprocs/yapp/yapp-preproc.c
Unescape View File

@ -43,11 +43,9 @@ YYSTYPE yapp_preproc_lval;
int isatty(int); int isatty(int);
void yapp_lex_initialize(FILE *f); void yapp_lex_initialize(FILE *f);
/*****************************************************************************/ /*****************************************************************************/
/* macro support - to be moved to a separate file later (?) */ /* macro support - to be moved to a separate file later (?) */
/*****************************************************************************/ /*****************************************************************************/
typedef struct YAPP_Macro_s { typedef struct YAPP_Macro_s {
SLIST_HEAD(macro_head, source_s) macro_head, param_head; SLIST_HEAD(macro_head, source_s) macro_head, param_head;
enum { enum {
@ -58,6 +56,17 @@ typedef struct YAPP_Macro_s {
int fillargs; int fillargs;
} YAPP_Macro; } YAPP_Macro;
YAPP_Macro *
yapp_macro_insert (char *name, int argc, int fillargs);
void
yapp_macro_error_exists (YAPP_Macro *v);
YAPP_Macro *
yapp_define_insert (char *name, int argc, int fillargs);
void
yapp_macro_delete (YAPP_Macro *ym);
YAPP_Macro * YAPP_Macro *
yapp_macro_insert (char *name, int argc, int fillargs) yapp_macro_insert (char *name, int argc, int fillargs)
@ -125,13 +134,29 @@ yapp_macro_get (const char *key)
/*****************************************************************************/ /*****************************************************************************/
void
append_token(int token);
int
append_through_return(void);
int
eat_through_return(void);
int
yapp_get_ident(const char *synlvl);
void
copy_token(YAPP_Token *tok);
void
expand_macro(YAPP_Macro *ym);
static void static void
yapp_preproc_initialize(FILE *f, const char *in_filename) yapp_preproc_initialize(FILE *f, const char *in_filename)
{ {
is_interactive = f ? (isatty(fileno(f)) > 0) : 0; is_interactive = f ? (isatty(fileno(f)) > 0) : 0;
current_file = (char *)in_filename; current_file = xstrdup(in_filename);
yapp_lex_initialize(f); yapp_lex_initialize(f);
SLIST_INIT(&output_head); SLIST_INIT(&output_head);
SLIST_INIT(&source_head); SLIST_INIT(&source_head);
@ -205,7 +230,7 @@ push_else(int val)
/* Clear the curent if* context level */ /* Clear the curent if* context level */
static void static void
pop_if() pop_if(void)
{ {
out = SLIST_FIRST(&output_head); out = SLIST_FIRST(&output_head);
current_output = out->out; current_output = out->out;
@ -282,7 +307,7 @@ append_token(int token)
} }
int int
append_through_return() append_through_return(void)
{ {
int token; int token;
do { do {
@ -295,7 +320,7 @@ append_through_return()
} }
int int
eat_through_return() eat_through_return(void)
{ {
int token; int token;
while ((token = yapp_preproc_lex()) != '\n') { while ((token = yapp_preproc_lex()) != '\n') {
@ -308,7 +333,7 @@ eat_through_return()
} }
int int
yapp_get_ident(char *synlvl) yapp_get_ident(const char *synlvl)
{ {
int token = yapp_preproc_lex(); int token = yapp_preproc_lex();
if (token != IDENT) { if (token != IDENT) {

2
modules/preprocs/yapp/yapp-token.h
Unescape View File

@ -60,4 +60,4 @@ extern YYSTYPE yapp_preproc_lval;
extern char *current_file; extern char *current_file;
extern int line_number; extern int line_number;
int yapp_preproc_lex (); int yapp_preproc_lex(void);

39
src/preprocs/yapp/yapp-preproc.c
Unescape View File

@ -43,11 +43,9 @@ YYSTYPE yapp_preproc_lval;
int isatty(int); int isatty(int);
void yapp_lex_initialize(FILE *f); void yapp_lex_initialize(FILE *f);
/*****************************************************************************/ /*****************************************************************************/
/* macro support - to be moved to a separate file later (?) */ /* macro support - to be moved to a separate file later (?) */
/*****************************************************************************/ /*****************************************************************************/
typedef struct YAPP_Macro_s { typedef struct YAPP_Macro_s {
SLIST_HEAD(macro_head, source_s) macro_head, param_head; SLIST_HEAD(macro_head, source_s) macro_head, param_head;
enum { enum {
@ -58,6 +56,17 @@ typedef struct YAPP_Macro_s {
int fillargs; int fillargs;
} YAPP_Macro; } YAPP_Macro;
YAPP_Macro *
yapp_macro_insert (char *name, int argc, int fillargs);
void
yapp_macro_error_exists (YAPP_Macro *v);
YAPP_Macro *
yapp_define_insert (char *name, int argc, int fillargs);
void
yapp_macro_delete (YAPP_Macro *ym);
YAPP_Macro * YAPP_Macro *
yapp_macro_insert (char *name, int argc, int fillargs) yapp_macro_insert (char *name, int argc, int fillargs)
@ -125,13 +134,29 @@ yapp_macro_get (const char *key)
/*****************************************************************************/ /*****************************************************************************/
void
append_token(int token);
int
append_through_return(void);
int
eat_through_return(void);
int
yapp_get_ident(const char *synlvl);
void
copy_token(YAPP_Token *tok);
void
expand_macro(YAPP_Macro *ym);
static void static void
yapp_preproc_initialize(FILE *f, const char *in_filename) yapp_preproc_initialize(FILE *f, const char *in_filename)
{ {
is_interactive = f ? (isatty(fileno(f)) > 0) : 0; is_interactive = f ? (isatty(fileno(f)) > 0) : 0;
current_file = (char *)in_filename; current_file = xstrdup(in_filename);
yapp_lex_initialize(f); yapp_lex_initialize(f);
SLIST_INIT(&output_head); SLIST_INIT(&output_head);
SLIST_INIT(&source_head); SLIST_INIT(&source_head);
@ -205,7 +230,7 @@ push_else(int val)
/* Clear the curent if* context level */ /* Clear the curent if* context level */
static void static void
pop_if() pop_if(void)
{ {
out = SLIST_FIRST(&output_head); out = SLIST_FIRST(&output_head);
current_output = out->out; current_output = out->out;
@ -282,7 +307,7 @@ append_token(int token)
} }
int int
append_through_return() append_through_return(void)
{ {
int token; int token;
do { do {
@ -295,7 +320,7 @@ append_through_return()
} }
int int
eat_through_return() eat_through_return(void)
{ {
int token; int token;
while ((token = yapp_preproc_lex()) != '\n') { while ((token = yapp_preproc_lex()) != '\n') {
@ -308,7 +333,7 @@ eat_through_return()
} }
int int
yapp_get_ident(char *synlvl) yapp_get_ident(const char *synlvl)
{ {
int token = yapp_preproc_lex(); int token = yapp_preproc_lex();
if (token != IDENT) { if (token != IDENT) {

2
src/preprocs/yapp/yapp-token.h
Unescape View File

@ -60,4 +60,4 @@ extern YYSTYPE yapp_preproc_lval;
extern char *current_file; extern char *current_file;
extern int line_number; extern int line_number;
int yapp_preproc_lex (); int yapp_preproc_lex(void);

Write Preview
Loading…
Cancel
Save