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

Added a module to manage attribute/value pairs.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@5575 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2012-03-04 20:17:34 +00:00
parent 4f61106043
commit 594e446ac5
5 changed files with 309 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/sp65/attr.c Normal file
View File

@@ -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 <stdio.h>
#include <string.h>
/* 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);
}
}

104
src/sp65/attr.h Normal file
View File

@@ -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

12
src/sp65/main.c
View File

@@ -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)), static void OptVerbose (const char* Opt attribute ((unused)),
const char* Arg attribute ((unused))) const char* Arg attribute ((unused)))
/* Increase versbosity */ /* Increase versbosity */
@@ -110,6 +117,7 @@ int main (int argc, char* argv [])
/* Program long options */ /* Program long options */
static const LongOpt OptTab[] = { static const LongOpt OptTab[] = {
{ "--help", 0, OptHelp }, { "--help", 0, OptHelp },
{ "--read", 1, OptRead },
{ "--verbose", 0, OptVerbose }, { "--verbose", 0, OptVerbose },
{ "--version", 0, OptVersion }, { "--version", 0, OptVersion },
}; };
@@ -142,6 +150,10 @@ int main (int argc, char* argv [])
OptHelp (Arg, 0); OptHelp (Arg, 0);
break; break;
case 'r':
OptRead (Arg, GetArg (&I, 2));
break;
case 'v': case 'v':
OptVerbose (Arg, 0); OptVerbose (Arg, 0);
break; break;

1
src/sp65/make/gcc.mak
View File

@@ -23,6 +23,7 @@ LDFLAGS =
# List of all object files # List of all object files
OBJS = asm.o \ OBJS = asm.o \
attr.o \
bin.o \ bin.o \
bitmap.o \ bitmap.o \
color.o \ color.o \

1
src/sp65/make/watcom.mak
View File

@@ -61,6 +61,7 @@ endif
# All OBJ files # All OBJ files
OBJS = asm.obj \ OBJS = asm.obj \
attr.obj \
bin.obj \ bin.obj \
bitmap.obj \ bitmap.obj \
color.obj \ color.obj \