/* */
/* */
/* */
-/* (C) 1998-2000 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 1998-2009, Ullrich von Bassewitz */
+/* Roemerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
#include <ctype.h>
/* common */
+#include "chartype.h"
+#include "strbuf.h"
#include "xsprintf.h"
/* ld65 */
/* Current token and attributes */
-unsigned CfgTok;
-char CfgSVal [CFG_MAX_IDENT_LEN+1];
+cfgtok_t CfgTok;
+StrBuf CfgSVal = STATIC_STRBUF_INITIALIZER;
unsigned long CfgIVal;
/* Error location */
void CfgWarning (const char* Format, ...)
/* Print a warning message adding file name and line number of the config file */
{
- char Buf [512];
+ StrBuf Buf = STATIC_STRBUF_INITIALIZER;
va_list ap;
va_start (ap, Format);
- xvsprintf (Buf, sizeof (Buf), Format, ap);
+ SB_VPrintf (&Buf, Format, ap);
va_end (ap);
- Warning ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
+ Warning ("%s(%u): %s", CfgGetName(), CfgErrorLine, SB_GetConstBuf (&Buf));
+ SB_Done (&Buf);
}
void CfgError (const char* Format, ...)
/* Print an error message adding file name and line number of the config file */
{
- char Buf [512];
+ StrBuf Buf = STATIC_STRBUF_INITIALIZER;
va_list ap;
va_start (ap, Format);
- xvsprintf (Buf, sizeof (Buf), Format, ap);
+ SB_VPrintf (&Buf, Format, ap);
va_end (ap);
- Error ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
+ Error ("%s(%u): %s", CfgGetName(), CfgErrorLine, SB_GetConstBuf (&Buf));
+ SB_Done (&Buf);
}
/* Read from buffer */
C = (unsigned char)(*CfgBuf);
if (C == 0) {
- C = EOF;
+ C = EOF;
} else {
++CfgBuf;
}
-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)) {
CfgErrorCol = InputCol;
/* Identifier? */
- if (C == '_' || isalpha (C)) {
+ if (C == '_' || IsAlpha (C)) {
/* Read the identifier */
- I = 0;
- while (C == '_' || isalnum (C)) {
- if (I < CFG_MAX_IDENT_LEN) {
- CfgSVal [I++] = C;
- }
+ SB_Clear (&CfgSVal);
+ while (C == '_' || IsAlNum (C)) {
+ SB_AppendChar (&CfgSVal, C);
NextChar ();
}
- CfgSVal [I] = '\0';
+ SB_Terminate (&CfgSVal);
CfgTok = CFGTOK_IDENT;
return;
}
if (C == '$') {
NextChar ();
if (!isxdigit (C)) {
- Error ("%s(%u): Hex digit expected", CfgName, InputLine);
+ CfgError ("Hex digit expected");
}
CfgIVal = 0;
while (isxdigit (C)) {
/* Other characters */
switch (C) {
+ case '-':
+ NextChar ();
+ CfgTok = CFGTOK_MINUS;
+ break;
+
+ case '+':
+ NextChar ();
+ CfgTok = CFGTOK_PLUS;
+ break;
+
+ case '*':
+ NextChar ();
+ CfgTok = CFGTOK_MUL;
+ break;
+
+ case '/':
+ NextChar ();
+ CfgTok = CFGTOK_DIV;
+ break;
+
+ case '(':
+ NextChar ();
+ CfgTok = CFGTOK_LPAR;
+ break;
+
+ case ')':
+ NextChar ();
+ CfgTok = CFGTOK_RPAR;
+ break;
+
case '{':
NextChar ();
CfgTok = CFGTOK_LCURLY;
case ':':
NextChar ();
CfgTok = CFGTOK_COLON;
- break;
+ break;
case '\"':
- NextChar ();
- I = 0;
- while (C != '\"') {
- if (C == EOF || C == '\n') {
- Error ("%s(%u): Unterminated string", CfgName, InputLine);
- }
- 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;
+ break;
case 'S':
NextChar ();
break;
default:
- Error ("%s(%u): Invalid character `%c'", CfgName, InputLine, C);
+ CfgError ("Invalid character `%c'", C);
}
}
-void CfgConsume (unsigned T, const char* Msg)
+void CfgConsume (cfgtok_t T, const char* Msg)
/* 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;
}
}
}
/* Not found or no identifier */
- Error ("%s(%u): %s expected", CfgName, InputLine, Name);
+ CfgError ("%s expected", Name);
}
const char* CfgGetName (void)
/* Get the name of the config file */
{
- return CfgName? CfgName : "";
+ if (CfgName) {
+ return CfgName;
+ } else if (CfgBuf) {
+ return "[builtin config]";
+ } else {
+ return "";
+ }
}
+
projects / cc65 / blobdiff