summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-19 18:22:31 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-19 18:22:31 +0000
commitce4bf096296c2e96d506901a6273a3a47071f74c (patch)
treec9e4c8a7a6304bbf9730562fae74eaecda779347
parent5f8004ef09b91a6f5e814e55de1d842626de8c97 (diff)
downloadhercules-ce4bf096296c2e96d506901a6273a3a47071f74c.tar.gz
hercules-ce4bf096296c2e96d506901a6273a3a47071f74c.tar.bz2
hercules-ce4bf096296c2e96d506901a6273a3a47071f74c.tar.xz
hercules-ce4bf096296c2e96d506901a6273a3a47071f74c.zip
- Fixed the label dup code, it now works correctly with const.txt switch labels.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9676 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/script.c55
2 files changed, 20 insertions, 37 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index da24a7dc4..c3f91b712 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/01/19
+ * Fixed the label dup code, it now works correctly with const.txt switch
+ labels.
* Reverted the dup-label check code since it has a bug that needs to be
fixed first (it fails to recognize const.txt values) [Skotlex]
* Fixed a client crash during SQL char selection if you for some reason had
diff --git a/src/map/script.c b/src/map/script.c
index 97ee095d6..dee24cdc9 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -140,9 +140,7 @@ static struct {
int index;
int count;
int flag;
-#if 0
struct linkdb_node *case_label;
-#endif
} curly[256]; // 右カッコの情報
int curly_count; // 右カッコの数
int index; // スクリプト内で使用した構文の数
@@ -960,9 +958,7 @@ const char* parse_curly_close(const char* p) {
sprintf(label,"__SW%x_FIN",syntax.curly[pos].index);
l=add_str(label);
set_label(l,script_pos, p);
-#if 0
linkdb_final(&syntax.curly[pos].case_label); // free the list of case label
-#endif
syntax.curly_count--;
return p+1;
} else {
@@ -1027,13 +1023,8 @@ const char* parse_syntax(const char* p) {
return p+1;
} else {
char label[256];
-#if 0 //See next #if 0
int l,v;
char *np;
-#else
- int len;
- int l;
-#endif
if(syntax.curly[pos].count != 1) {
// FALLTHRU 用のジャンプ
sprintf(label,"goto __SW%x_%xJ;",syntax.curly[pos].index,syntax.curly[pos].count);
@@ -1051,36 +1042,31 @@ const char* parse_syntax(const char* p) {
if(p == p2) {
disp_error_message("parse_syntax: expect space ' '",p);
}
-#if 0
//TODO: This is incomplete as it doesn't takes into account const.txt entries!
// check whether case label is integer or not
v = strtol(p,&np,0);
- if(np == p)
- disp_error_message("parse_syntax: 'case' label not integer",p);
- if((*p == '-' || *p == '+') && isdigit(p[1])) // pre-skip because '-' can not skip_word
- p++;
- p = skip_word(p);
- if(np != p)
- disp_error_message("parse_syntax: 'case' label not integer",np);
+ if(np == p) { //Check for constants
+ p2 = skip_word(p);
+ v = p2-p; // length of word at p2
+ memcpy(label,p,v);
+ label[v]='\0';
+ v = search_str(label);
+ if (v < 0 || str_data[v].type != C_INT)
+ disp_error_message("parse_syntax: 'case' label not integer",p);
+ v = str_data[v].val;
+ p = skip_word(p);
+ } else { //Numeric value
+ if((*p == '-' || *p == '+') && isdigit(p[1])) // pre-skip because '-' can not skip_word
+ p++;
+ p = skip_word(p);
+ if(np != p)
+ disp_error_message("parse_syntax: 'case' label not integer",np);
+ }
p = skip_space(p);
if(*p != ':')
disp_error_message("parse_syntax: expect ':'",p);
sprintf(label,"if(%d != $@__SW%x_VAL) goto __SW%x_%x;",
v,syntax.curly[pos].index,syntax.curly[pos].index,syntax.curly[pos].count+1);
-#else
- p2 = p;
- if((*p == '-' || *p == '+') && isdigit(p[1])) // pre-skip because '-' can not skip_word
- p++;
- p = skip_word(p);
- len = p-p2; // length of word at p2
- p = skip_space(p);
- if(*p != ':')
- disp_error_message("parse_syntax: expect ':'",p);
- memcpy(label,"if(",3);
- memcpy(label+3,p2,len);
- sprintf(label+3+len," != $@__SW%x_VAL) goto __SW%x_%x;",
- syntax.curly[pos].index,syntax.curly[pos].index,syntax.curly[pos].count+1);
-#endif
syntax.curly[syntax.curly_count++].type = TYPE_NULL;
// 2回parse しないとダメ
p2 = parse_line(label);
@@ -1092,12 +1078,11 @@ const char* parse_syntax(const char* p) {
l=add_str(label);
set_label(l,script_pos,p);
}
-#if 0 //TODO: pending fix on converting constants to numbers.
// check duplication of case label [Rayce]
if(linkdb_search(&syntax.curly[pos].case_label, (void*)v) != NULL)
disp_error_message("parse_syntax: dup 'case'",p);
linkdb_insert(&syntax.curly[pos].case_label, (void*)v, (void*)1);
-#endif
+
sprintf(label,"set $@__SW%x_VAL,0;",syntax.curly[pos].index);
syntax.curly[syntax.curly_count++].type = TYPE_NULL;
@@ -1734,9 +1719,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
if( setjmp( error_jump ) != 0 ) {
//Restore program state when script has problems. [from jA]
int i;
-#if 0
const int size = sizeof(syntax.curly)/sizeof(syntax.curly[0]);
-#endif
if( error_report )
script_error(src,file,line,error_msg,error_pos);
aFree( error_msg );
@@ -1746,10 +1729,8 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
script_buf = NULL;
for(i=LABEL_START;i<str_num;i++)
if(str_data[i].type == C_NOP) str_data[i].type = C_NAME;
-#if 0
for(i=0; i<size; i++)
linkdb_final(&syntax.curly[i].case_label);
-#endif
return NULL;
}