6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 19:29:37 +00:00
Code Issues Projects Releases Wiki Activity

More conforming to the cc65 project's apparent writing style.

Browse Source
This commit is contained in:
Greg King 2014-05-23 16:52:02 -04:00
parent a92f51fea5
commit 2cc26e6e23
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsrc/common/strqtok.c
View File

@ -1,15 +1,15 @@
/*
** strqtok() is like strtok(): It finds pieces of text, in a string, that are
** surrounded by given delimiter characters. It returns each piece, in turn,
** as a string, until every piece has been found. Then, it returns NULL. But,
** strqtok() recognizes quotation marks. A mark makes delimiters look ordinary
** until another quotation mark is seen. That allows us to include delimiters
** in tokens. (This version doesn't allow escaped quotation marks.)
**
** 2014-04-19, Daniel Serpell
** 2014-04-21, Paul Foerster
** 2014-04-25, Greg King
*/
* strqtok() is like strtok(): It finds pieces of text, in a string, that are
* surrounded by given delimiter characters. It returns each piece, in turn,
* as a string, until every piece has been found. Then, it returns NULL. But,
* strqtok() recognizes quotation marks. A mark makes delimiters look ordinary
* until another quotation mark is seen. That allows us to include delimiters
* in tokens. (This version doesn't allow escaped quotation marks.)
*
* 2014-04-19, Daniel Serpell
* 2014-04-21, Paul Foerster
* 2014-04-25, Greg King
*/
#include <string.h>
@ -18,8 +18,8 @@
char* __fastcall__ strqtok (register char* s1, const char* s2)
{
static char c;
static char *start;
static char *next = "";
static char* start;
static char* next = "";
if (s1 == NULL) {
s1 = next;
@ -49,7 +49,7 @@ char* __fastcall__ strqtok (register char* s1, const char* s2)
}
if (c == '\0') {
/* The end of the last token is the end of the token list;
** don't go beyond it.
* don't go beyond it.
*/
goto found;
}
@ -70,7 +70,7 @@ char* __fastcall__ strqtok (register char* s1, const char* s2)
/* Search for the end of a quoted token. */
if ((s1 = strchr (s1, '\"')) == NULL) {
/* The quoted token ended with '\0'; therefore, point to a '\0',
** so that the next call will return NULL.
* so that the next call will return NULL.
*/
next = "";
return start;

63
testcode/lib/strqtok-test.c
View File

@ -1,31 +1,32 @@
/* strqtok-test.c
**
** 2014-04-21, Paul Foerster
** 2014-05-20, Greg King
**
** This program tests that strqtok() correctly will parse strings
** with quotation marks in them. It should show this list of tokens
** from the test strings:
**
** >This<
** > is only <
** >a<
** >short<
** >quoting<
** >test , honoring blanks, commas<
** >and<
** >(4)<
** >empty<
** ><
** ><
** ><
** ><
** >strings, EOT <
**
** It shouldn't show
**
** >Bogus token<
*/
*
* 2014-04-21, Paul Foerster
* 2014-05-20, Greg King
*
* This program tests that strqtok() correctly will parse strings
* with quotation marks in them. It should show this list of tokens
* from the test strings:
*
* >This<
* > is only <
* >a<
* >short<
* >quoting<
* >test , honoring blanks, commas<
* >and<
* >(4)<
* >empty<
* ><
* ><
* ><
* ><
* >strings, EOT <
*
* It shouldn't show
*
* >Bogus token<
*
*/
#include <string.h>
#include <stdio.h>
@ -33,15 +34,15 @@
void main (void)
{
/* b[] and s[] are declared as automatic, not static, variables
** because strqtok() will change them.
** They must be defined together; and, b[] must be defined first
** (because they're copied onto the top-down stack).
* because strqtok() will change them.
* They must be defined together; and, b[] must be defined first
* (because they're copied onto the top-down stack).
*/
char b[] = "Bogus token ";
char s[] = " This , \" is only \"a short "
"quoting\"test , honoring blanks"
", commas\", and (4) empty \"\"\"\"\"\"\"\" \"strings, EOT ";
char *t = strqtok (s, " ,");
char* t = strqtok (s, " ,");
while (t != NULL) {
printf (">%s<\n", t);