diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix syntax_errors properly.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@518 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2002-06-05 01:34:06 +00:00
parent 3a660ed7af
commit 136f2b4ed9
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
C/init.c
View File

@@ -1030,6 +1030,7 @@ InitCodes(void)
heap_regs->foreign_code_loaded = NULL; heap_regs->foreign_code_loaded = NULL;
heap_regs->yap_lib_dir = NULL; heap_regs->yap_lib_dir = NULL;
heap_regs->agc_hook = NULL; heap_regs->agc_hook = NULL;
heap_regs->parser_error_style = EXCEPTION_ON_PARSER_ERROR;
heap_regs->size_of_overflow = 0; heap_regs->size_of_overflow = 0;
/* make sure no one else can use these two atoms */ /* make sure no one else can use these two atoms */
CurrentModule = 0; CurrentModule = 0;

18
C/iopreds.c
View File

@@ -170,8 +170,6 @@ STATIC_PROTO (Int GetArgSizeFromChar, (Term *));
static int parser_error_style = EXCEPTION_ON_PARSER_ERROR;
#if EMACS #if EMACS
static int first_char; static int first_char;
#endif #endif
@@ -2794,13 +2792,13 @@ p_set_read_error_handler(void)
} }
s = RepAtom(AtomOfTerm(t))->StrOfAE; s = RepAtom(AtomOfTerm(t))->StrOfAE;
if (!strcmp(s, "fail")) { if (!strcmp(s, "fail")) {
parser_error_style = FAIL_ON_PARSER_ERROR; ParserErrorStyle = FAIL_ON_PARSER_ERROR;
} else if (!strcmp(s, "error")) { } else if (!strcmp(s, "error")) {
parser_error_style = EXCEPTION_ON_PARSER_ERROR; ParserErrorStyle = EXCEPTION_ON_PARSER_ERROR;
} else if (!strcmp(s, "quiet")) { } else if (!strcmp(s, "quiet")) {
parser_error_style = QUIET_ON_PARSER_ERROR; ParserErrorStyle = QUIET_ON_PARSER_ERROR;
} else if (!strcmp(s, "dec10")) { } else if (!strcmp(s, "dec10")) {
parser_error_style = CONTINUE_ON_PARSER_ERROR; ParserErrorStyle = CONTINUE_ON_PARSER_ERROR;
} else { } else {
Error(DOMAIN_ERROR_SYNTAX_ERROR_HANDLER,t,"bad syntax_error handler"); Error(DOMAIN_ERROR_SYNTAX_ERROR_HANDLER,t,"bad syntax_error handler");
return(FALSE); return(FALSE);
@@ -2814,7 +2812,7 @@ p_get_read_error_handler(void)
{ {
Term t; Term t;
switch (parser_error_style) { switch (ParserErrorStyle) {
case FAIL_ON_PARSER_ERROR: case FAIL_ON_PARSER_ERROR:
t = MkAtomTerm(LookupAtom("fail")); t = MkAtomTerm(LookupAtom("fail"));
break; break;
@@ -2893,10 +2891,10 @@ p_read (void)
} }
} }
TR = old_TR; TR = old_TR;
if (parser_error_style == QUIET_ON_PARSER_ERROR) { if (ParserErrorStyle == QUIET_ON_PARSER_ERROR) {
/* just fail */ /* just fail */
return(FALSE); return(FALSE);
} else if (parser_error_style == CONTINUE_ON_PARSER_ERROR) { } else if (ParserErrorStyle == CONTINUE_ON_PARSER_ERROR) {
ErrorMessage = NULL; ErrorMessage = NULL;
/* try again */ /* try again */
goto repeat_cycle; goto repeat_cycle;
@@ -2905,7 +2903,7 @@ p_read (void)
if (ErrorMessage == NULL) if (ErrorMessage == NULL)
ErrorMessage = "SYNTAX ERROR"; ErrorMessage = "SYNTAX ERROR";
if (parser_error_style == EXCEPTION_ON_PARSER_ERROR) { if (ParserErrorStyle == EXCEPTION_ON_PARSER_ERROR) {
Error(SYNTAX_ERROR,terr,ErrorMessage); Error(SYNTAX_ERROR,terr,ErrorMessage);
return(FALSE); return(FALSE);
} else /* FAIL ON PARSER ERROR */ { } else /* FAIL ON PARSER ERROR */ {

4
H/Heap.h
View File

@@ -10,7 +10,7 @@
* File: Heap.h * * File: Heap.h *
* mods: * * mods: *
* comments: Heap Init Structure * * comments: Heap Init Structure *
* version: $Id: Heap.h,v 1.28 2002-06-04 18:21:54 vsc Exp $ * * version: $Id: Heap.h,v 1.29 2002-06-05 01:34:06 vsc Exp $ *
*************************************************************************/ *************************************************************************/
/* information that can be stored in Code Space */ /* information that can be stored in Code Space */
@@ -291,6 +291,7 @@ typedef struct various_codes {
void *foreign_code_loaded; void *foreign_code_loaded;
char *yap_lib_dir; char *yap_lib_dir;
Agc_hook agc_hook; Agc_hook agc_hook;
int parser_error_style;
#if defined(YAPOR) || defined(TABLING) #if defined(YAPOR) || defined(TABLING)
struct global_data global; struct global_data global;
struct local_data remote[MAX_WORKERS]; struct local_data remote[MAX_WORKERS];
@@ -485,6 +486,7 @@ typedef struct various_codes {
#define ForeignCodeLoaded heap_regs->foreign_code_loaded #define ForeignCodeLoaded heap_regs->foreign_code_loaded
#define Yap_LibDir heap_regs->yap_lib_dir #define Yap_LibDir heap_regs->yap_lib_dir
#define AGCHook heap_regs->agc_hook #define AGCHook heap_regs->agc_hook
#define ParserErrorStyle heap_regs->parser_error_style
#define DeadClauses heap_regs->dead_clauses #define DeadClauses heap_regs->dead_clauses
#define SizeOfOverflow heap_regs->size_of_overflow #define SizeOfOverflow heap_regs->size_of_overflow
#define LastWtimePtr heap_regs->last_wtime #define LastWtimePtr heap_regs->last_wtime

5
H/iopreds.h
View File

@@ -102,11 +102,6 @@ StreamDesc Stream[MaxStreams];
#define Pipe_Stream_f 0x040000 #define Pipe_Stream_f 0x040000
#define Popen_Stream_f 0x080000 #define Popen_Stream_f 0x080000
#define FAIL_ON_PARSER_ERROR 0
#define QUIET_ON_PARSER_ERROR 1
#define CONTINUE_ON_PARSER_ERROR 2
#define EXCEPTION_ON_PARSER_ERROR 3
#define StdInStream 0 #define StdInStream 0
#define StdOutStream 1 #define StdOutStream 1
#define StdErrStream 2 #define StdErrStream 2

5
H/yapio.h
View File

@@ -314,6 +314,11 @@ extern int Portray_delays;
#define HashFunction(CHP,OUT) { (OUT)=0; while(*(CHP) != '\0') (OUT) += *(CHP)++; (OUT) %= MaxHash; } #define HashFunction(CHP,OUT) { (OUT)=0; while(*(CHP) != '\0') (OUT) += *(CHP)++; (OUT) %= MaxHash; }
#define FAIL_ON_PARSER_ERROR 0
#define QUIET_ON_PARSER_ERROR 1
#define CONTINUE_ON_PARSER_ERROR 2
#define EXCEPTION_ON_PARSER_ERROR 3
extern jmp_buf IOBotch; extern jmp_buf IOBotch;
extern int in_getc; extern int in_getc;

2
pl/boot.yap
View File

@@ -79,7 +79,7 @@ read_sig.
( (
'$get_value'('$break',0) '$get_value'('$break',0)
-> ->
'$set_read_error_handler'(error), % '$set_read_error_handler'(error), let the user do that
% after an abort, make sure all spy points are gone. % after an abort, make sure all spy points are gone.
'$clean_debugging_info', '$clean_debugging_info',
% simple trick to find out if this is we are booting from Prolog. % simple trick to find out if this is we are booting from Prolog.