projects
/
henge
/
apc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed debug messages
[henge/apc.git]
/
src
/
scanner.c
diff --git
a/src/scanner.c
b/src/scanner.c
index
96b66b6
..
d9aa426
100644
(file)
--- a/
src/scanner.c
+++ b/
src/scanner.c
@@
-32,8
+32,11
@@
yypstate* apc_pstate;
yycstate* apc_cstate;
/* Private */
extern //lexer.rl
yycstate* apc_cstate;
/* Private */
extern //lexer.rl
-int lexer_lexfile(uint8_t const*);
-#define PUSHTOK(T,L) yypush_parse(apc_pstate, T, L, apc_cstate)
+int lexer_lexfile(uint8_t*);
+extern //lexer.rl
+int lexer_lexdir(uint8_t*);
+extern //lexer.rl
+void lexer_closedir(void);
/* Init
Establishes yy states
/* Init
Establishes yy states
@@
-93,25
+96,20
@@
int scanner_scandir
goto scan_next_dirent;
switch (direntp->d_type)
{ case DT_REG:
goto scan_next_dirent;
switch (direntp->d_type)
{ case DT_REG:
- printf("lexfile %s\n",direntp->d_name);
lexer_lexfile((uint8_t*)direntp->d_name);
goto scan_next_dirent;
case DT_DIR:
lexer_lexfile((uint8_t*)direntp->d_name);
goto scan_next_dirent;
case DT_DIR:
- lexer_lexfile((uint8_t*)direntp->d_name); //lex the dirname
- printf("lexdir %s\n",direntp->d_name);
+ lexer_lexdir((uint8_t*)direntp->d_name); //lex the dirname
if (chdir(direntp->d_name)) //change to the specified dir
goto libfail;
errno = 0;
if ((cdirp = opendir(".")) == NULL || errno) //open it
goto libfail;
if (chdir(direntp->d_name)) //change to the specified dir
goto libfail;
errno = 0;
if ((cdirp = opendir(".")) == NULL || errno) //open it
goto libfail;
- PUSHTOK(CLOPEN, NULL); //push "Open Directory" token
- printf("Scanner entered [%s]\n",direntp->d_name);
if(scanner_scandir(cdirp)) //scan the directory
goto libfail;
if (chdir("..")) //return to the parent dir
goto libfail;
if(scanner_scandir(cdirp)) //scan the directory
goto libfail;
if (chdir("..")) //return to the parent dir
goto libfail;
- PUSHTOK(CLCLOSE, NULL); //push "Close Directory" token
- printf("Scanner returned\n");
+ lexer_closedir(); //push "Close Directory" token
goto scan_next_dirent; //continue scan
case DT_UNKNOWN:
warnx("unknown file %s: ignoring", direntp->d_name);
goto scan_next_dirent; //continue scan
case DT_UNKNOWN:
warnx("unknown file %s: ignoring", direntp->d_name);