[Z88dk-commits] CVS: z88dk/src/z80asm asmdrctv.c,1.85,1.86

Bridge to the z88dk-commits mailing list
Post Reply
pauloscustodio

[Z88dk-commits] CVS: z88dk/src/z80asm asmdrctv.c,1.85,1.86

Post by pauloscustodio »

Update of /cvsroot/z88dk/z88dk/src/z80asm
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19599

Modified Files:
asmdrctv.c
Log Message:
TK_EOF renamed TK_END

Index: asmdrctv.c
===================================================================
RCS file: /cvsroot/z88dk/z88dk/src/z80asm/asmdrctv.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** asmdrctv.c 22 Mar 2014 16:15:24 -0000 1.85
--- asmdrctv.c 29 Mar 2014 00:11:51 -0000 1.86
***************
*** 231,235 ****
}

! while ( tok != TK_EOF && tok != TK_LCURLY )
{
Skipline();
--- 231,235 ----
}

! while ( tok != TK_END && tok != TK_LCURLY )
{
Skipline();
***************
*** 241,245 ****
if ( tok == TK_LCURLY )
{
! while ( tok != TK_EOF && GetSym() != TK_RCURLY )
{
if ( EOL )
--- 241,245 ----
if ( tok == TK_LCURLY )
{
! while ( tok != TK_END && GetSym() != TK_RCURLY )
{
if ( EOL )
***************
*** 269,273 ****
DEFINE_STR( name, MAXLINE );

! while ( tok != TK_EOF && GetSym() != TK_LCURLY )
{
Skipline();
--- 269,273 ----
DEFINE_STR( name, MAXLINE );

! while ( tok != TK_END && GetSym() != TK_LCURLY )
{
Skipline();
***************
*** 277,281 ****
if ( tok == TK_LCURLY )
{
! while ( tok != TK_EOF && tok != TK_RCURLY )
{
if ( EOL )
--- 277,281 ----
if ( tok == TK_LCURLY )
{
! while ( tok != TK_END && tok != TK_RCURLY )
{
if ( EOL )
***************
*** 557,561 ****
++bytepos;

! if ( tok == TK_NEWLINE || tok == TK_EOF )
{
break;
--- 557,561 ----
++bytepos;

! if ( tok == TK_NEWLINE || tok == TK_END )
{
break;
***************
*** 589,593 ****
bytepos += 2;

! if ( tok == TK_NEWLINE || tok == TK_EOF )
{
break;
--- 589,593 ----
bytepos += 2;

! if ( tok == TK_NEWLINE || tok == TK_END )
{
break;
***************
*** 637,641 ****
bytepos += 1;

! if ( tok == TK_NEWLINE || tok == TK_EOF )
{
break;
--- 637,641 ----
bytepos += 1;

! if ( tok == TK_NEWLINE || tok == TK_END )
{
break;
***************
*** 669,673 ****
bytepos += 4;

! if ( tok == TK_NEWLINE || tok == TK_EOF )
{
break;
--- 669,673 ----
bytepos += 4;

! if ( tok == TK_NEWLINE || tok == TK_END )
{
break;
***************
*** 702,706 ****

GetSym();
! if ( tok != TK_STRING_CAT && tok != TK_COMMA && tok != TK_NEWLINE && tok != TK_EOF)
{
error_syntax();
--- 702,706 ----

GetSym();
! if ( tok != TK_STRING_CAT && tok != TK_COMMA && tok != TK_NEWLINE && tok != TK_END)
{
error_syntax();
***************
*** 715,719 ****
}

! if ( tok != TK_STRING_CAT && tok != TK_COMMA && tok != TK_NEWLINE && tok != TK_EOF)
{
error_syntax(); /* expression separator not found */
--- 715,719 ----
}

! if ( tok != TK_STRING_CAT && tok != TK_COMMA && tok != TK_NEWLINE && tok != TK_END)
{
error_syntax(); /* expression separator not found */
***************
*** 725,729 ****
}
}
! while ( tok != TK_NEWLINE && tok != TK_EOF );
}

--- 725,729 ----
}
}
! while ( tok != TK_NEWLINE && tok != TK_END );
}

***************
*** 799,802 ****
--- 799,805 ----
/*
* $Log$
+ * Revision 1.86 2014/03/29 00:11:51 pauloscustodio
+ * TK_EOF renamed TK_END
+ *
* Revision 1.85 2014/03/22 16:15:24 pauloscustodio
* Memory leak - delete expression if not defined
***************
*** 819,823 ****
*
* Revision 1.80 2014/03/11 23:34:00 pauloscustodio
! * Remove check for feof(z80asmfile), add token TK_EOF to return on EOF.
* Allows decoupling of input file used in scanner from callers.
* Removed TOTALLINES.
--- 822,826 ----
*
* Revision 1.80 2014/03/11 23:34:00 pauloscustodio
! * Remove check for feof(z80asmfile), add token TK_END to return on EOF.
* Allows decoupling of input file used in scanner from callers.
* Removed TOTALLINES.


------------------------------------------------------------------------------
Post Reply