projects
/
YACASL2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bbc3d71
)
' '中に;が含まれる行を正しく処理できないバグを修正
author
j8takagi
<j8takagi@nifty.com>
Sun, 7 Feb 2010 15:59:48 +0000
(
00:59
+0900)
committer
j8takagi
<j8takagi@nifty.com>
Sun, 7 Feb 2010 16:12:44 +0000
(
01:12
+0900)
src/token.c
patch
|
blob
|
history
diff --git
a/src/token.c
b/src/token.c
index
aa0a620
..
48ed6ec
100644
(file)
--- a/
src/token.c
+++ b/
src/token.c
@@
-58,18
+58,27
@@
OPD *opdtok(const char *str)
CMDLINE *linetok(const char *line)
{
char *tokens, *p, *q, *sepp;
CMDLINE *linetok(const char *line)
{
char *tokens, *p, *q, *sepp;
+ bool quote = false;
CMDLINE *cmdl = malloc(sizeof(CMDLINE));
if(line == NULL || strlen(line) == 0) {
return NULL;
}
tokens = p = strdup(line);
CMDLINE *cmdl = malloc(sizeof(CMDLINE));
if(line == NULL || strlen(line) == 0) {
return NULL;
}
tokens = p = strdup(line);
- /* コメントを削除 */
- if((q = strchr(tokens, ';')) != NULL) {
- *q = '\0';
- }
+ /* 空行の場合、NULLを返す */
if(*p == '\0') {
return NULL;
}
if(*p == '\0') {
return NULL;
}
+ /* ' 'で囲まれていない;以降の文字列は、コメントとして削除 */
+ while(p != NULL) {
+ if((q = strchr(tokens, '\'')) != NULL) {
+ quote = !quote;
+ p = q;
+ }
+ if(quote == false && (p = strchr(p, ';')) != NULL) {
+ *p = '\0';
+ }
+ }
+ p = tokens;
/* 行の先頭が空白またはタブの場合、ラベルは空 */
if((sepp = p + strcspn(p, " \t\n")) == p){
cmdl->label = NULL;
/* 行の先頭が空白またはタブの場合、ラベルは空 */
if((sepp = p + strcspn(p, " \t\n")) == p){
cmdl->label = NULL;