Name cleanup.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@385 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-04-05 03:38:23 +00:00
commit a774679eaa

View file

@ -18,16 +18,16 @@ static char cvsroot[] = "$Header$";
#include <ctype.h> #include <ctype.h>
struct SwigScanner { struct SwigScanner {
DOH *text; /* Current token value */ DOHString *text; /* Current token value */
DOH *scanobjs; /* Objects being scanned */ DOHList *scanobjs; /* Objects being scanned */
DOH *str; /* Current object being scanned */ DOHString *str; /* Current object being scanned */
char *idstart; /* Optional identifier start characters */ char *idstart; /* Optional identifier start characters */
int nexttoken; /* Next token to be returned */ int nexttoken; /* Next token to be returned */
int start_line; /* Starting line of certain declarations */ int start_line; /* Starting line of certain declarations */
int string_start; int string_start;
int line; int line;
int yylen; /* Length of text pushed into text */ int yylen; /* Length of text pushed into text */
DOH *file; DOHString *file;
}; };
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -95,7 +95,7 @@ SwigScanner_clear(SwigScanner *s) {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
void void
SwigScanner_push(SwigScanner *s, DOH *txt) { SwigScanner_push(SwigScanner *s, DOHString *txt) {
assert(s && txt); assert(s && txt);
Push(s->scanobjs,txt); Push(s->scanobjs,txt);
if (s->str) Delete(s->str); if (s->str) Delete(s->str);
@ -125,7 +125,7 @@ SwigScanner_pushtoken(SwigScanner *s, int nt) {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
void void
SwigScanner_set_location(SwigScanner *s, DOH *file, int line) { SwigScanner_set_location(SwigScanner *s, DOHString *file, int line) {
Setline(s->str,line); Setline(s->str,line);
Setfile(s->str,file); Setfile(s->str,file);
} }
@ -136,7 +136,7 @@ SwigScanner_set_location(SwigScanner *s, DOH *file, int line) {
* Get the current file. * Get the current file.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
DOH * DOHString *
SwigScanner_get_file(SwigScanner *s) { SwigScanner_get_file(SwigScanner *s) {
return Getfile(s->str); return Getfile(s->str);
} }
@ -670,7 +670,7 @@ SwigScanner_token(SwigScanner *s) {
* Return the lexene associated with the last returned token. * Return the lexene associated with the last returned token.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
DOH * DOHString *
SwigScanner_text(SwigScanner *s) { SwigScanner_text(SwigScanner *s) {
return s->text; return s->text;
} }