projects
/
pforth
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #80 from letoh/use-pattern-rules
[pforth]
/
csrc
/
pfcompil.c
diff --git
a/csrc/pfcompil.c
b/csrc/pfcompil.c
index
b618c9f
..
01574df
100644
(file)
--- a/
csrc/pfcompil.c
+++ b/
csrc/pfcompil.c
@@
-981,7
+981,7
@@
ThrowCode ffIncludeFile( FileStream *InputFile )
***************************************************************/
Err ffPushInputStream( FileStream *InputFile )
{
***************************************************************/
Err ffPushInputStream( FileStream *InputFile )
{
-
cell_t
Result = 0;
+
Err
Result = 0;
IncludeFrame *inf;
/* Push current input state onto special include stack. */
IncludeFrame *inf;
/* Push current input state onto special include stack. */
@@
-1156,9
+1156,14
@@
cell_t ffRefill( void )
if( gCurrentTask->td_InputStream == PF_STDIN )
{
/* ACCEPT is deferred so we call it through the dictionary. */
if( gCurrentTask->td_InputStream == PF_STDIN )
{
/* ACCEPT is deferred so we call it through the dictionary. */
+ ThrowCode throwCode;
PUSH_DATA_STACK( gCurrentTask->td_SourcePtr );
PUSH_DATA_STACK( TIB_SIZE );
PUSH_DATA_STACK( gCurrentTask->td_SourcePtr );
PUSH_DATA_STACK( TIB_SIZE );
- pfCatch( gAcceptP_XT );
+ throwCode = pfCatch( gAcceptP_XT );
+ if (throwCode) {
+ Result = throwCode;
+ goto error;
+ }
Num = POP_DATA_STACK;
if( Num < 0 )
{
Num = POP_DATA_STACK;
if( Num < 0 )
{