the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete redesign of line info generation. Uses spans instead of a fragment

Browse Source 
list as before.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5162 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2011-08-14 19:23:16 +00:00
parent e67c802193
commit b8549f0af8
11 changed files with 375 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ca65/scanner.c
View File

@@ -122,8 +122,8 @@ struct CharSource {
/* Current input variables */
static CharSource* Source = 0; /* Current char source */
static unsigned FCount = 0; /* Count of input files */
static int C = 0; /* Current input character */
static unsigned FCount = 0; /* Count of input files */
static int C = 0; /* Current input character */
/* Force end of assembly */
int ForcedEnd = 0;
@@ -818,7 +818,7 @@ static int Sweet16Reg (const StrBuf* Id)
void NextRawTok (void)
/* Read the next raw token from the input stream */
{
Macro* M;
Macro* M;
/* If we've a forced end of assembly, don't read further */
if (ForcedEnd) {
@@ -831,7 +831,7 @@ Restart:
if (InputFromStack ()) {
if (CurTok.Tok == TOK_IDENT && (M = FindDefine (&CurTok.SVal)) != 0) {
/* This is a define style macro - expand it */
MacExpandStart (M);
MacExpandStart (M);
goto Restart;
}
return;
@@ -852,7 +852,7 @@ Again:
SB_Clear (&CurTok.SVal);
/* Generate line info for the current token */
GenLineInfo (LI_SLOT_ASM, &CurTok.Pos);
NewAsmLine ();
/* Hex number or PC symbol? */
if (C == '$') {
@@ -901,7 +901,7 @@ Again:
CurTok.IVal = 0;
}
CurTok.IVal = (CurTok.IVal << 1) + DigitVal (C);
NextChar ();
NextChar ();
}
/* This is an integer constant */
@@ -1097,7 +1097,7 @@ Again:
break;
default:
break;
break;
}
} else if (CPU == CPU_SWEET16 &&
@@ -1195,7 +1195,7 @@ CharAgain:
NextChar ();
switch (C) {
case ':':
case ':':
NextChar ();
CurTok.Tok = TOK_NAMESPACE;
break;
@@ -1244,7 +1244,7 @@ CharAgain:
case '#':
NextChar ();
CurTok.Tok = TOK_HASH;
return;
return;
case '(':
NextChar ();
@@ -1342,7 +1342,7 @@ CharAgain:
}
CurTok.IVal = C;
CurTok.Tok = TOK_CHARCON;
NextChar ();
NextChar ();
if (C != '\'') {
if (!MissingCharTerm) {
Error ("Illegal character constant");