mirror of
https://github.com/netwide-assembler/nasm.git
synced 2025-09-22 10:43:39 -04:00
preproc: Align members in structures
For easier reading Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
86
preproc.c
86
preproc.c
@@ -117,10 +117,10 @@ struct SMacro {
|
|||||||
* The context stack is composed of a linked list of these.
|
* The context stack is composed of a linked list of these.
|
||||||
*/
|
*/
|
||||||
struct Context {
|
struct Context {
|
||||||
Context *next;
|
Context *next;
|
||||||
char *name;
|
char *name;
|
||||||
struct hash_table localmac;
|
struct hash_table localmac;
|
||||||
uint32_t number;
|
uint32_t number;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -162,13 +162,13 @@ struct tokseq_match {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct Token {
|
struct Token {
|
||||||
Token *next;
|
Token *next;
|
||||||
char *text;
|
char *text;
|
||||||
union {
|
union {
|
||||||
SMacro *mac; /* associated macro for TOK_SMAC_END */
|
SMacro *mac; /* associated macro for TOK_SMAC_END */
|
||||||
size_t len; /* scratch length field */
|
size_t len; /* scratch length field */
|
||||||
} a; /* Auxiliary data */
|
} a; /* Auxiliary data */
|
||||||
enum pp_token_type type;
|
enum pp_token_type type;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -182,8 +182,8 @@ struct Token {
|
|||||||
* if walked, would emit the expansion lines in the proper order.
|
* if walked, would emit the expansion lines in the proper order.
|
||||||
*/
|
*/
|
||||||
struct Line {
|
struct Line {
|
||||||
Line *next;
|
Line *next;
|
||||||
Token *first;
|
Token *first;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -208,30 +208,31 @@ enum pp_exp_type {
|
|||||||
* `prev' field is for the global `expansions` linked-list.
|
* `prev' field is for the global `expansions` linked-list.
|
||||||
*/
|
*/
|
||||||
struct ExpDef {
|
struct ExpDef {
|
||||||
ExpDef *prev; /* previous definition */
|
ExpDef *prev; /* previous definition */
|
||||||
ExpDef *next; /* next in hash table */
|
ExpDef *next; /* next in hash table */
|
||||||
enum pp_exp_type type; /* expansion type */
|
enum pp_exp_type type; /* expansion type */
|
||||||
char *name; /* definition name */
|
char *name; /* definition name */
|
||||||
int nparam_min, nparam_max;
|
int nparam_min;
|
||||||
bool casesense;
|
int nparam_max;
|
||||||
bool plus; /* is the last parameter greedy? */
|
bool casesense;
|
||||||
bool nolist; /* is this expansion listing-inhibited? */
|
bool plus; /* is the last parameter greedy? */
|
||||||
Token *dlist; /* all defaults as one list */
|
bool nolist; /* is this expansion listing-inhibited? */
|
||||||
Token **defaults; /* parameter default pointers */
|
Token *dlist; /* all defaults as one list */
|
||||||
int ndefs; /* number of default parameters */
|
Token **defaults; /* parameter default pointers */
|
||||||
|
int ndefs; /* number of default parameters */
|
||||||
|
|
||||||
int prepend; /* label prepend state */
|
int prepend; /* label prepend state */
|
||||||
Line *label;
|
Line *label;
|
||||||
Line *line;
|
Line *line;
|
||||||
Line *last;
|
Line *last;
|
||||||
int linecount; /* number of lines within expansion */
|
int linecount; /* number of lines within expansion */
|
||||||
|
|
||||||
int64_t def_depth; /* current number of definition pairs deep */
|
int64_t def_depth; /* current number of definition pairs deep */
|
||||||
int64_t cur_depth; /* current number of expansions */
|
int64_t cur_depth; /* current number of expansions */
|
||||||
int64_t max_depth; /* maximum number of expansions allowed */
|
int64_t max_depth; /* maximum number of expansions allowed */
|
||||||
|
|
||||||
int state; /* condition state */
|
int state; /* condition state */
|
||||||
bool ignoring; /* ignoring definition lines */
|
bool ignoring; /* ignoring definition lines */
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -269,13 +270,14 @@ struct ExpInv {
|
|||||||
* stack (ie linked list) of these things.
|
* stack (ie linked list) of these things.
|
||||||
*/
|
*/
|
||||||
struct Include {
|
struct Include {
|
||||||
Include *next;
|
Include *next;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
Cond *conds;
|
Cond *conds;
|
||||||
ExpInv *expansion;
|
ExpInv *expansion;
|
||||||
char *fname;
|
char *fname;
|
||||||
int lineno, lineinc;
|
int lineno;
|
||||||
int mmac_depth;
|
int lineinc;
|
||||||
|
int mmac_depth;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -284,8 +286,8 @@ struct Include {
|
|||||||
* attempt to find the file if it's not in the current directory.
|
* attempt to find the file if it's not in the current directory.
|
||||||
*/
|
*/
|
||||||
struct IncPath {
|
struct IncPath {
|
||||||
IncPath *next;
|
IncPath *next;
|
||||||
char *path;
|
char *path;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user