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

This commit was generated by cvs2svn to compensate for changes in r557,

Browse Source 
which included commits to RCS files with non-trunk default branches.

svn path=/trunk/yasm/; revision=558
0.3
cvs2svn 23 years ago
parent d93c3d4735
commit ba51bb383c
2 changed files with 40 additions and 133 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. 161
      tools/lemon/lemon.c
  2. 12
      tools/lemon/lempar.c

161
tools/lemon/lemon.c
Unescape View File

@ -24,8 +24,6 @@
** Author contact information: ** Author contact information:
** drh@acm.org ** drh@acm.org
** http://www.hwaci.com/drh/ ** http://www.hwaci.com/drh/
**
** $Id: lemon.c,v 1.1 2002/04/07 19:13:04 peter Exp $
*/ */
#include <stdio.h> #include <stdio.h>
#include <varargs.h> #include <varargs.h>
@ -101,11 +99,11 @@ struct s_options {
char *arg; char *arg;
char *message; char *message;
}; };
int optinit(/* char**,struct s_options*,FILE* */); int OptInit(/* char**,struct s_options*,FILE* */);
int optnargs(/* void */); int OptNArgs(/* void */);
char *optarg(/* int */); char *OptArg(/* int */);
void opterr(/* int */); void OptErr(/* int */);
void optprint(/* void */); void OptPrint(/* void */);
/******** From the file "parse.h" *****************************************/ /******** From the file "parse.h" *****************************************/
void Parse(/* struct lemon *lemp */); void Parse(/* struct lemon *lemp */);
@ -282,10 +280,7 @@ struct lemon {
char *tokendest; /* Code to execute to destroy token data */ char *tokendest; /* Code to execute to destroy token data */
int tokendestln; /* Line number for token destroyer code */ int tokendestln; /* Line number for token destroyer code */
char *filename; /* Name of the input file */ char *filename; /* Name of the input file */
char *basename; /* Basename of inputer file (no directory or path */
char *outname; /* Name of the current output file */ char *outname; /* Name of the current output file */
char *outdirname; /* Name of the output directory, specified by user */
char *templatename; /* Name of template file to use, specified by user */
char *tokenprefix; /* A prefix added to token names in the .h file */ char *tokenprefix; /* A prefix added to token names in the .h file */
int nconflict; /* Number of parsing conflicts */ int nconflict; /* Number of parsing conflicts */
int tablesize; /* Size of the parse tables */ int tablesize; /* Size of the parse tables */
@ -380,7 +375,8 @@ struct action *ap2;
rc = ap1->sp->index - ap2->sp->index; rc = ap1->sp->index - ap2->sp->index;
if( rc==0 ) rc = (int)ap1->type - (int)ap2->type; if( rc==0 ) rc = (int)ap1->type - (int)ap2->type;
if( rc==0 ){ if( rc==0 ){
assert( ap1->type==REDUCE && ap2->type==REDUCE ); assert( ap1->type==REDUCE || ap1->type==RD_RESOLVED || ap1->type==CONFLICT);
assert( ap2->type==REDUCE || ap2->type==RD_RESOLVED || ap2->type==CONFLICT);
rc = ap1->x.rp->index - ap2->x.rp->index; rc = ap1->x.rp->index - ap2->x.rp->index;
} }
return rc; return rc;
@ -1171,43 +1167,6 @@ void memory_error(){
exit(1); exit(1);
} }
/* Locates the basename in a string possibly containing paths,
* including forward-slash and backward-slash delimiters on Windows,
* and allocates a new string containing just the basename.
* Returns the pointer to that string.
*/
PRIVATE char*
make_basename(char* fullname)
{
char *cp;
char *new_string;
/* Find the last forward slash */
cp = strrchr(fullname, '/');
#ifdef WIN32
/* On Windows, if no forward slash was found, look ofr
* backslash also */
if (!cp)
cp = strrchr(fullname, '\\');
#endif
if (!cp) {
new_string = malloc( strlen(fullname) );
strcpy(new_string, fullname);
}
else {
/* skip the slash */
cp++;
new_string = malloc( strlen(cp) );
strcpy(new_string, cp);
}
return new_string;
}
/* The main program. Parse the command line and do it... */ /* The main program. Parse the command line and do it... */
int main(argc,argv) int main(argc,argv)
@ -1221,24 +1180,20 @@ char **argv;
static int quiet = 0; static int quiet = 0;
static int statistics = 0; static int statistics = 0;
static int mhflag = 0; static int mhflag = 0;
static char *outdirname = NULL;
static char *templatename = NULL;
static struct s_options options[] = { static struct s_options options[] = {
{OPT_FLAG, "b", (char*)&basisflag, "Print only the basis in report."}, {OPT_FLAG, "b", (char*)&basisflag, "Print only the basis in report."},
{OPT_FLAG, "c", (char*)&compress, "Don't compress the action table."}, {OPT_FLAG, "c", (char*)&compress, "Don't compress the action table."},
{OPT_STR, "d", (char*)&outdirname, "Output directory name."},
{OPT_FLAG, "g", (char*)&rpflag, "Print grammar without actions."}, {OPT_FLAG, "g", (char*)&rpflag, "Print grammar without actions."},
{OPT_FLAG, "m", (char*)&mhflag, "Output a makeheaders compatible file"}, {OPT_FLAG, "m", (char*)&mhflag, "Output a makeheaders compatible file"},
{OPT_FLAG, "q", (char*)&quiet, "(Quiet) Don't print the report file."}, {OPT_FLAG, "q", (char*)&quiet, "(Quiet) Don't print the report file."},
{OPT_FLAG, "s", (char*)&statistics, "Print parser stats to standard output."}, {OPT_FLAG, "s", (char*)&statistics, "Print parser stats to standard output."},
{OPT_STR, "t", (char*)&templatename, "Template file to use."},
{OPT_FLAG, "x", (char*)&version, "Print the version number."}, {OPT_FLAG, "x", (char*)&version, "Print the version number."},
{OPT_FLAG,0,0,0} {OPT_FLAG,0,0,0}
}; };
int i; int i;
struct lemon lem; struct lemon lem;
optinit(argv,options,stderr); OptInit(argv,options,stderr);
if( version ){ if( version ){
printf("Lemon version 1.0\n" printf("Lemon version 1.0\n"
"Copyright 1991-1997 by D. Richard Hipp\n" "Copyright 1991-1997 by D. Richard Hipp\n"
@ -1246,7 +1201,7 @@ char **argv;
); );
exit(0); exit(0);
} }
if( optnargs()!=1 ){ if( OptNArgs()!=1 ){
fprintf(stderr,"Exactly one filename argument is required.\n"); fprintf(stderr,"Exactly one filename argument is required.\n");
exit(1); exit(1);
} }
@ -1257,7 +1212,7 @@ char **argv;
Symbol_init(); Symbol_init();
State_init(); State_init();
lem.argv0 = argv[0]; lem.argv0 = argv[0];
lem.filename = optarg(0); lem.filename = OptArg(0);
lem.basisflag = basisflag; lem.basisflag = basisflag;
lem.nconflict = 0; lem.nconflict = 0;
lem.name = lem.include = lem.arg = lem.tokentype = lem.start = 0; lem.name = lem.include = lem.arg = lem.tokentype = lem.start = 0;
@ -1267,9 +1222,6 @@ char **argv;
lem.tablesize = 0; lem.tablesize = 0;
Symbol_new("$"); Symbol_new("$");
lem.errsym = Symbol_new("error"); lem.errsym = Symbol_new("error");
lem.outdirname = outdirname;
lem.templatename = templatename;
lem.basename = make_basename(lem.filename);
/* Parse the input file */ /* Parse the input file */
Parse(&lem); Parse(&lem);
@ -1644,7 +1596,7 @@ FILE *err;
return errcnt; return errcnt;
} }
int optinit(a,o,err) int OptInit(a,o,err)
char **a; char **a;
struct s_options *o; struct s_options *o;
FILE *err; FILE *err;
@ -1665,13 +1617,13 @@ FILE *err;
} }
if( errcnt>0 ){ if( errcnt>0 ){
fprintf(err,"Valid command line options for \"%s\" are:\n",*a); fprintf(err,"Valid command line options for \"%s\" are:\n",*a);
optprint(); OptPrint();
exit(1); exit(1);
} }
return 0; return 0;
} }
int optnargs(){ int OptNArgs(){
int cnt = 0; int cnt = 0;
int dashdash = 0; int dashdash = 0;
int i; int i;
@ -1684,7 +1636,7 @@ int optnargs(){
return cnt; return cnt;
} }
char *optarg(n) char *OptArg(n)
int n; int n;
{ {
int i; int i;
@ -1692,7 +1644,7 @@ int n;
return i>=0 ? argv[i] : 0; return i>=0 ? argv[i] : 0;
} }
void opterr(n) void OptErr(n)
int n; int n;
{ {
int i; int i;
@ -1700,7 +1652,7 @@ int n;
if( i>=0 ) errline(i,0,errstream); if( i>=0 ) errline(i,0,errstream);
} }
void optprint(){ void OptPrint(){
int i; int i;
int max, len; int max, len;
max = 0; max = 0;
@ -2258,7 +2210,7 @@ struct lemon *gp;
} }
} }
if( c==0 ){ if( c==0 ){
ErrorMsg(ps.filename,startline, ErrorMsg(ps.filename,ps.tokenlineno,
"C code starting on this line is not terminated before the end of the file."); "C code starting on this line is not terminated before the end of the file.");
ps.errorcnt++; ps.errorcnt++;
nextcp = cp; nextcp = cp;
@ -2361,77 +2313,37 @@ struct plink *plp;
** name comes from malloc() and must be freed by the calling ** name comes from malloc() and must be freed by the calling
** function. ** function.
*/ */
PRIVATE char *file_makename(pattern,suffix) PRIVATE char *file_makename(lemp,suffix)
char *pattern; struct lemon *lemp;
char *suffix; char *suffix;
{ {
char *name; char *name;
char *cp; char *cp;
name = malloc( strlen(pattern) + strlen(suffix) + 5 ); name = malloc( strlen(lemp->filename) + strlen(suffix) + 5 );
if( name==0 ){ if( name==0 ){
fprintf(stderr,"Can't allocate space for a filename.\n"); fprintf(stderr,"Can't allocate space for a filename.\n");
exit(1); exit(1);
} }
strcpy(name,pattern); strcpy(name,lemp->filename);
cp = strrchr(name,'.'); cp = strrchr(name,'.');
if( cp ) *cp = 0; if( cp ) *cp = 0;
strcat(name,suffix); strcat(name,suffix);
return name; return name;
} }
/* Generate a filename with the given suffix. Uses only
** the basename of the input file, not the entire path. This
** is useful for creating output files when using outdirname.
** Space to hold this name comes from malloc() and must be
** freed by the calling function.
*/
PRIVATE char *file_makename_using_basename(lemp,suffix)
struct lemon *lemp;
char *suffix;
{
return file_makename(lemp->basename, suffix);
}
/* Open a file with a name based on the name of the input file, /* Open a file with a name based on the name of the input file,
** but with a different (specified) suffix, and return a pointer ** but with a different (specified) suffix, and return a pointer
** to the stream. Prepend outdirname for both reads and writes, because ** to the stream */
** the only time we read is when checking for an already-produced
** header file, which should exist in the output directory, not the
** input directory. If we ever need to file_open(,,"r") on the input
** side, we should add another arg to file_open() indicating which
** directory, ("input, "output", or "other") we should deal with.
*/
PRIVATE FILE *file_open(lemp,suffix,mode) PRIVATE FILE *file_open(lemp,suffix,mode)
struct lemon *lemp; struct lemon *lemp;
char *suffix; char *suffix;
char *mode; char *mode;
{ {
FILE *fp; FILE *fp;
char *name;
if( lemp->outname ) free(lemp->outname); if( lemp->outname ) free(lemp->outname);
name = file_makename_using_basename(lemp, suffix); lemp->outname = file_makename(lemp, suffix);
if ( lemp->outdirname != NULL ) {
lemp->outname = malloc( strlen(lemp->outdirname) + strlen(name) + 2);
if ( lemp->outname == 0 ) {
fprintf(stderr, "Can't allocate space for dir/filename");
exit(1);
}
strcpy(lemp->outname, lemp->outdirname);
#ifdef __WIN32__
strcat(lemp->outname, "\\");
#else
strcat(lemp->outname, "/");
#endif
strcat(lemp->outname, name);
free(name);
}
else {
lemp->outname = name;
}
fp = fopen(lemp->outname,mode); fp = fopen(lemp->outname,mode);
if( fp==0 && *mode=='w' ){ if( fp==0 && *mode=='w' ){
fprintf(stderr,"Can't open file \"%s\".\n",lemp->outname); fprintf(stderr,"Can't open file \"%s\".\n",lemp->outname);
@ -2723,21 +2635,16 @@ struct lemon *lemp;
char *tpltname; char *tpltname;
char *cp; char *cp;
if (lemp->templatename) { cp = strrchr(lemp->filename,'.');
tpltname = lemp->templatename; if( cp ){
sprintf(buf,"%.*s.lt",(int)cp-(int)lemp->filename,lemp->filename);
}else{
sprintf(buf,"%s.lt",lemp->filename);
} }
else { if( access(buf,004)==0 ){
cp = strrchr(lemp->filename,'.'); tpltname = buf;
if( cp ){ }else{
sprintf(buf,"%.*s.lt",(int)cp-(int)lemp->filename,lemp->filename); tpltname = pathsearch(lemp->argv0,templatename,0);
}else{
sprintf(buf,"%s.lt",lemp->filename);
}
if( access(buf,004)==0 ){
tpltname = buf;
}else{
tpltname = pathsearch(lemp->argv0,templatename,0);
}
} }
if( tpltname==0 ){ if( tpltname==0 ){
fprintf(stderr,"Can't find the parser driver template file \"%s\".\n", fprintf(stderr,"Can't find the parser driver template file \"%s\".\n",
@ -3041,7 +2948,7 @@ int mhflag; /* Output in makeheaders format if true */
/* Generate the include code, if any */ /* Generate the include code, if any */
tplt_print(out,lemp,lemp->include,lemp->includeln,&lineno); tplt_print(out,lemp,lemp->include,lemp->includeln,&lineno);
if( mhflag ){ if( mhflag ){
char *name = file_makename_using_basename(lemp, ".h"); char *name = file_makename(lemp, ".h");
fprintf(out,"#include \"%s\"\n", name); lineno++; fprintf(out,"#include \"%s\"\n", name); lineno++;
free(name); free(name);
} }
@ -3089,7 +2996,7 @@ int mhflag; /* Output in makeheaders format if true */
int i; int i;
i = strlen(lemp->arg); i = strlen(lemp->arg);
while( i>=1 && isspace(lemp->arg[i-1]) ) i--; while( i>=1 && isspace(lemp->arg[i-1]) ) i--;
while( i>=1 && isalnum(lemp->arg[i-1]) ) i--; while( i>=1 && (isalnum(lemp->arg[i-1]) || lemp->arg[i-1]=='_') ) i--;
fprintf(out,"#define %sARGDECL ,%s\n",name,&lemp->arg[i]); lineno++; fprintf(out,"#define %sARGDECL ,%s\n",name,&lemp->arg[i]); lineno++;
fprintf(out,"#define %sXARGDECL %s;\n",name,lemp->arg); lineno++; fprintf(out,"#define %sXARGDECL %s;\n",name,lemp->arg); lineno++;
fprintf(out,"#define %sANSIARGDECL ,%s\n",name,lemp->arg); lineno++; fprintf(out,"#define %sANSIARGDECL ,%s\n",name,lemp->arg); lineno++;

12
tools/lemon/lempar.c
Unescape View File

@ -202,9 +202,9 @@ static char *yyTokenName[] = {
** A pointer to a parser. This pointer is used in subsequent calls ** A pointer to a parser. This pointer is used in subsequent calls
** to Parse and ParseFree. ** to Parse and ParseFree.
*/ */
void *ParseAlloc(void *(*mallocProc)()){ void *ParseAlloc(void *(*mallocProc)(int)){
yyParser *pParser; yyParser *pParser;
pParser = (yyParser*)(*mallocProc)( sizeof(yyParser), __FILE__, __LINE__ ); pParser = (yyParser*)(*mallocProc)( (int)sizeof(yyParser) );
if( pParser ){ if( pParser ){
pParser->idx = -1; pParser->idx = -1;
} }
@ -272,13 +272,13 @@ static int yy_pop_parser_stack(yyParser *pParser){
** </ul> ** </ul>
*/ */
void ParseFree( void ParseFree(
void *p, /* The parser to be deleted */ void *p, /* The parser to be deleted */
void (*freeProc)() /* Function used to reclaim memory */ void (*freeProc)(void*) /* Function used to reclaim memory */
){ ){
yyParser *pParser = (yyParser*)p; yyParser *pParser = (yyParser*)p;
if( pParser==0 ) return; if( pParser==0 ) return;
while( pParser->idx>=0 ) yy_pop_parser_stack(pParser); while( pParser->idx>=0 ) yy_pop_parser_stack(pParser);
(*freeProc)(pParser, __FILE__, __LINE__); (*freeProc)((void*)pParser);
} }
/* /*
@ -359,7 +359,7 @@ static struct {
%% %%
}; };
static void yy_accept(); /* Forward declaration */ static void yy_accept(yyParser * ParseANSIARGDECL); /* Forward Declaration */
/* /*
** Perform a reduce action and the shift that must immediately ** Perform a reduce action and the shift that must immediately

Write Preview
Loading…
Cancel
Save