/* */
/* */
/* */
-/* (C) 1998-2008, Ullrich von Bassewitz */
+/* (C) 1998-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* Current token and attributes */
cfgtok_t CfgTok;
-char CfgSVal [CFG_MAX_IDENT_LEN+1];
+StrBuf CfgSVal = STATIC_STRBUF_INITIALIZER;
unsigned long CfgIVal;
/* Error location */
-void CfgNextTok (void)
-/* Read the next token from the input stream */
+static void StrVal (void)
+/* Parse a string value and expand escape sequences */
{
- unsigned I;
+ /* Skip the starting double quotes */
+ NextChar ();
+
+ /* Read input chars */
+ SB_Clear (&CfgSVal);
+ while (C != '\"') {
+ switch (C) {
+
+ case EOF:
+ case '\n':
+ CfgError ("Unterminated string");
+ break;
+
+ case '%':
+ NextChar ();
+ switch (C) {
+
+ case EOF:
+ case '\n':
+ case '\"':
+ CfgError ("Unterminated '%%' escape sequence");
+ break;
+
+ case '%':
+ SB_AppendChar (&CfgSVal, '%');
+ NextChar ();
+ break;
+
+ case 'O':
+ /* Replace by output file */
+ if (OutputName) {
+ SB_AppendStr (&CfgSVal, OutputName);
+ }
+ NextChar ();
+ break;
+
+ default:
+ CfgWarning ("Unkown escape sequence `%%%c'", C);
+ SB_AppendChar (&CfgSVal, '%');
+ SB_AppendChar (&CfgSVal, C);
+ NextChar ();
+ break;
+ }
+ break;
+
+ default:
+ SB_AppendChar (&CfgSVal, C);
+ NextChar ();
+ }
+ }
+
+ /* Skip the terminating double quotes */
+ NextChar ();
+
+ /* Terminate the string */
+ SB_Terminate (&CfgSVal);
+
+ /* We've read a string value */
+ CfgTok = CFGTOK_STRCON;
+}
+
+void CfgNextTok (void)
+/* Read the next token from the input stream */
+{
Again:
/* Skip whitespace */
while (isspace (C)) {
if (C == '_' || IsAlpha (C)) {
/* Read the identifier */
- I = 0;
+ SB_Clear (&CfgSVal);
while (C == '_' || IsAlNum (C)) {
- if (I < CFG_MAX_IDENT_LEN) {
- CfgSVal [I++] = C;
- }
+ SB_AppendChar (&CfgSVal, C);
NextChar ();
}
- CfgSVal [I] = '\0';
+ SB_Terminate (&CfgSVal);
CfgTok = CFGTOK_IDENT;
return;
}
break;
case '\"':
- NextChar ();
- I = 0;
- while (C != '\"') {
- if (C == EOF || C == '\n') {
- CfgError ("Unterminated string");
- }
- if (I < CFG_MAX_IDENT_LEN) {
- CfgSVal [I++] = C;
- }
- NextChar ();
- }
- NextChar ();
- CfgSVal [I] = '\0';
- CfgTok = CFGTOK_STRCON;
+ StrVal ();
break;
case '#':
case 'O':
NextChar ();
if (OutputName) {
- strncpy (CfgSVal, OutputName, CFG_MAX_IDENT_LEN);
- CfgSVal [CFG_MAX_IDENT_LEN] = '\0';
+ SB_CopyStr (&CfgSVal, OutputName);
} else {
- CfgSVal [0] = '\0';
+ SB_Clear (&CfgSVal);
}
+ SB_Terminate (&CfgSVal);
CfgTok = CFGTOK_STRCON;
break;
/* Skip a token, print an error message if not found */
{
if (CfgTok != T) {
- CfgError (Msg);
+ CfgError ("%s", Msg);
}
CfgNextTok ();
}
if (CfgTok == CFGTOK_IDENT) {
/* Make it upper case */
- I = 0;
- while (CfgSVal [I]) {
- CfgSVal [I] = toupper (CfgSVal [I]);
- ++I;
- }
+ SB_ToUpper (&CfgSVal);
/* Linear search */
for (I = 0; I < Size; ++I) {
- if (strcmp (CfgSVal, Table [I].Ident) == 0) {
- CfgTok = Table [I].Tok;
+ if (SB_CompareStr (&CfgSVal, Table[I].Ident) == 0) {
+ CfgTok = Table[I].Tok;
return;
}
}