From: uz Date: Sun, 4 Mar 2012 20:17:34 +0000 (+0000) Subject: Added a module to manage attribute/value pairs. X-Git-Tag: V2.14~488 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=594e446ac50faffab39159b5ffe4a68e12357db8;p=cc65 Added a module to manage attribute/value pairs. git-svn-id: svn://svn.cc65.org/cc65/trunk@5575 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/src/sp65/attr.c b/src/sp65/attr.c new file mode 100644 index 000000000..dfad5cc4f --- /dev/null +++ b/src/sp65/attr.c @@ -0,0 +1,191 @@ +/*****************************************************************************/ +/* */ +/* attr.c */ +/* */ +/* Command line attributes */ +/* */ +/* */ +/* */ +/* (C) 2012, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ +/* */ +/* */ +/* This software is provided 'as-is', without any expressed or implied */ +/* warranty. In no event will the authors be held liable for any damages */ +/* arising from the use of this software. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose, */ +/* including commercial applications, and to alter it and redistribute it */ +/* freely, subject to the following restrictions: */ +/* */ +/* 1. The origin of this software must not be misrepresented; you must not */ +/* claim that you wrote the original software. If you use this software */ +/* in a product, an acknowledgment in the product documentation would be */ +/* appreciated but is not required. */ +/* 2. Altered source versions must be plainly marked as such, and must not */ +/* be misrepresented as being the original software. */ +/* 3. This notice may not be removed or altered from any source */ +/* distribution. */ +/* */ +/*****************************************************************************/ + + + +#include +#include + +/* common */ +#include "chartype.h" +#include "strbuf.h" +#include "xmalloc.h" + +/* sp65 */ +#include "attr.h" +#include "error.h" + + + +/*****************************************************************************/ +/* Code */ +/*****************************************************************************/ + + + +static int IsNumber (const char* Value) +/* Check if Value is an integer number */ +{ + if (*Value == '-' || *Value == '+') { + ++Value; + } + while (IsDigit (*Value)) { + ++Value; + } + return (*Value == '\0'); +} + + + +Attr* NewAttr (const char* Name, const char* Value) +/* Create a new attribute */ +{ + /* Determine the length of Value */ + unsigned Len = strlen (Value); + + /* Allocate memory */ + Attr* A = xmalloc (sizeof (Attr) + Len); + + /* Initialize the fields */ + A->Flags = IsNumber (Value)? afInt : afNone; + A->Name = xstrdup (Name); + memcpy (A->Value, Value, Len + 1); + + /* Return the new struct */ + return A; +} + + + +void DumpAttrColl (const Collection* C) +/* Dump a collection of attribute/value pairs for debugging */ +{ + unsigned I; + for (I = 0; I < CollCount (C); ++I) { + const Attr* A = CollConstAt (C, I); + printf ("%s=%s\n", A->Name, A->Value); + } +} + + + +int FindAttr (const Collection* C, const char* Name, unsigned* Index) +/* Search for an attribute with the given name in the collection. If it is + * found, the function returns true and Index contains the index of the + * entry. If Name isn't found, the function returns false and Index + * will contain the insert position. + */ +{ + /* Do a binary search */ + int Lo = 0; + int Hi = (int) CollCount (C) - 1; + while (Lo <= Hi) { + + /* Mid of range */ + int Cur = (Lo + Hi) / 2; + + /* Get item */ + const Attr* A = CollAt (C, Cur); + + /* Compare */ + int Res = strcmp (A->Name, Name); + + /* Found? */ + if (Res < 0) { + Lo = Cur + 1; + } else if (Res > 0) { + Hi = Cur - 1; + } else { + /* Found! */ + *Index = Cur; + return 1; + } + } + + /* Pass back the insert position */ + *Index = Lo; + return 0; +} + + + +void AddAttr (Collection* C, const char* Name, const char* Value) +/* Add an attribute to an alphabetically sorted attribute collection */ +{ + /* Create a new attribute entry */ + Attr* A = NewAttr (Name, Value); + + /* Search for the attribute. If it is there, we have a duplicate, otherwise + * we have the insert position. + */ + unsigned Index; + if (FindAttr (C, Name, &Index)) { + Error ("Duplicate command line attribute `%s'", Name); + } + + /* Insert the attribute */ + CollInsert (C, A, Index); +} + + + +void SplitAddAttr (Collection* C, const char* Combined, const char* Name) +/* Split a combined name/value pair and add it as an attribute to C. Some + * attributes may not need a name. If the name is missing, use Name. If + * Name is NULL, terminate with an error. + */ +{ + /* Name and value are separated by an equal sign */ + const char* Pos = strchr (Combined, '='); + if (Pos == 0) { + /* Combined is actually a value */ + if (Name == 0) { + Error ("Command line attribute `%s' doesn't contain a name", Name); + } + AddAttr (C, Name, Combined); + } else { + /* Must split name and value */ + StrBuf N = AUTO_STRBUF_INITIALIZER; + SB_CopyBuf (&N, Combined, Pos - Combined); + SB_Terminate (&N); + + /* Add the attribute */ + AddAttr (C, SB_GetConstBuf (&N), Pos+1); + + /* Release memory */ + SB_Done (&N); + } +} + + + diff --git a/src/sp65/attr.h b/src/sp65/attr.h new file mode 100644 index 000000000..3d81cbf50 --- /dev/null +++ b/src/sp65/attr.h @@ -0,0 +1,104 @@ +/*****************************************************************************/ +/* */ +/* attr.h */ +/* */ +/* Command line attributes */ +/* */ +/* */ +/* */ +/* (C) 2012, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ +/* */ +/* */ +/* This software is provided 'as-is', without any expressed or implied */ +/* warranty. In no event will the authors be held liable for any damages */ +/* arising from the use of this software. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose, */ +/* including commercial applications, and to alter it and redistribute it */ +/* freely, subject to the following restrictions: */ +/* */ +/* 1. The origin of this software must not be misrepresented; you must not */ +/* claim that you wrote the original software. If you use this software */ +/* in a product, an acknowledgment in the product documentation would be */ +/* appreciated but is not required. */ +/* 2. Altered source versions must be plainly marked as such, and must not */ +/* be misrepresented as being the original software. */ +/* 3. This notice may not be removed or altered from any source */ +/* distribution. */ +/* */ +/*****************************************************************************/ + + + +#ifndef ATTRCOLL_H +#define ATTRCOLL_H + + + +/* common */ +#include "coll.h" + + + +/*****************************************************************************/ +/* Data */ +/*****************************************************************************/ + + + +/* Attribute flags */ +enum AttrFlags { + afNone, + afInt, /* Integer number */ +}; +typedef enum AttrFlags AttrFlags; + +/* */ +typedef struct Attr Attr; +struct Attr { + AttrFlags Flags; /* Attribute flags */ + char* Name; /* Attribute name */ + char Value[1]; /* Attribute value */ +}; + + + +/*****************************************************************************/ +/* Code */ +/*****************************************************************************/ + + + +Attr* NewAttr (const char* Name, const char* Value); +/* Create a new attribute */ + +void DumpAttrColl (const Collection* C); +/* Dump a collection of attribute/value pairs for debugging */ + +int FindAttr (const Collection* C, const char* Name, unsigned* Index); +/* Search for an attribute with the given name in the collection. If it is + * found, the function returns true and Index contains the index of the + * entry. If Name isn't found, the function returns false and Index + * will contain the insert position. + */ + +void AddAttr (Collection* C, const char* Name, const char* Value); +/* Add an attribute to an alphabetically sorted attribute collection */ + +void SplitAddAttr (Collection* C, const char* Combined, const char* Name); +/* Split a combined name/value pair and add it as an attribute to C. Some + * attributes may not need a name. If the name is missing, use Name. If + * Name is NULL, terminate with an error. + */ + + + +/* End of attr.h */ + +#endif + + + diff --git a/src/sp65/main.c b/src/sp65/main.c index 0db919515..61c7818ed 100644 --- a/src/sp65/main.c +++ b/src/sp65/main.c @@ -84,6 +84,13 @@ static void OptHelp (const char* Opt attribute ((unused)), +static void OptRead (const char* Opt attribute ((unused)), const char* Arg) +/* Read an input file */ +{ +} + + + static void OptVerbose (const char* Opt attribute ((unused)), const char* Arg attribute ((unused))) /* Increase versbosity */ @@ -110,6 +117,7 @@ int main (int argc, char* argv []) /* Program long options */ static const LongOpt OptTab[] = { { "--help", 0, OptHelp }, + { "--read", 1, OptRead }, { "--verbose", 0, OptVerbose }, { "--version", 0, OptVersion }, }; @@ -142,6 +150,10 @@ int main (int argc, char* argv []) OptHelp (Arg, 0); break; + case 'r': + OptRead (Arg, GetArg (&I, 2)); + break; + case 'v': OptVerbose (Arg, 0); break; diff --git a/src/sp65/make/gcc.mak b/src/sp65/make/gcc.mak index 22873cadc..d2bac974b 100644 --- a/src/sp65/make/gcc.mak +++ b/src/sp65/make/gcc.mak @@ -23,6 +23,7 @@ LDFLAGS = # List of all object files OBJS = asm.o \ + attr.o \ bin.o \ bitmap.o \ color.o \ diff --git a/src/sp65/make/watcom.mak b/src/sp65/make/watcom.mak index bc4521050..9642644d2 100644 --- a/src/sp65/make/watcom.mak +++ b/src/sp65/make/watcom.mak @@ -61,6 +61,7 @@ endif # All OBJ files OBJS = asm.obj \ + attr.obj \ bin.obj \ bitmap.obj \ color.obj \