1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
--- src/c/xmlback/eval.c.orig 2015-10-11 16:41:54 UTC
+++ src/c/xmlback/eval.c
@@ -198,9 +198,10 @@ ctx_clr (void) /*{{{*/
static inline void
check_error (void) /*{{{*/
{
- if (SLang_Error) {
+ if (SLang_get_error()) {
SLang_restart (1);
- SLang_Error = 0;
+ /*SLang_Error = 0;*/
+ SLang_set_error(0);
}
}/*}}}*/
static void
@@ -243,7 +244,8 @@ type_retreive (int argc) /*{{{*/
int dummy;
if (! (argv = (type_t *) malloc (argc * sizeof (type_t)))) {
- SLang_Error = SL_MALLOC_ERROR;
+ /*SLang_Error = SL_MALLOC_ERROR;*/
+ SLang_set_error(SL_MALLOC_ERROR);
return NULL;
}
for (n = 0; n < argc; ++n)
@@ -262,7 +264,7 @@ type_retreive (int argc) /*{{{*/
argv[n].v.n = (double) dummy;
break;
case SLANG_DOUBLE_TYPE:
- if (SLang_pop_double (& argv[n].v.n, & dummy, & dummy) == -1)
+ if (SLang_pop_double (& argv[n].v.n) == -1)
st = false;
break;
case SLANG_STRING_TYPE:
@@ -901,7 +903,8 @@ SLin (void) /*{{{*/
argc = SLang_Num_Function_Args;
if (argc < 2) {
- SLang_Error = SL_SYNTAX_ERROR;
+ /*SLang_Error = SL_SYNTAX_ERROR;*/
+ SLang_set_error(SL_SYNTAX_ERROR);
return -1;
}
rc = 0;
@@ -928,7 +931,8 @@ SLin (void) /*{{{*/
}
free (i);
} else {
- SLang_Error = SL_MALLOC_ERROR;
+ /*SLang_Error = SL_MALLOC_ERROR;*/
+ SLang_set_error(SL_MALLOC_ERROR);
rc = -1;
}
}
@@ -940,7 +944,7 @@ SLin (void) /*{{{*/
if (d = (double *) malloc (argc * sizeof (double))) {
for (n = 0; n < argc; ++n)
- if (SLang_pop_double (& d[n], & dummy, & dummy) == -1) {
+ if (SLang_pop_double (& d[n]) == -1) {
rc = -1;
break;
}
@@ -952,7 +956,8 @@ SLin (void) /*{{{*/
}
free (d);
} else {
- SLang_Error = SL_MALLOC_ERROR;
+ /*SLang_Error = SL_MALLOC_ERROR;*/
+ SLang_set_error(SL_MALLOC_ERROR);
rc = -1;
}
}
@@ -980,14 +985,16 @@ SLin (void) /*{{{*/
}
free (s);
} else {
- SLang_Error = SL_MALLOC_ERROR;
+ /*SLang_Error = SL_MALLOC_ERROR;*/
+ SLang_set_error(SL_MALLOC_ERROR);
rc = -1;
}
}
break;
}
- if ((rc == -1) && (! SLang_Error))
- SLang_Error = SL_TYPE_MISMATCH;
+ if ((rc == -1) && (! SLang_get_error()))
+ /*SLang_Error = SL_TYPE_MISMATCH;*/
+ SLang_set_error(SL_TYPE_MISMATCH);
return rc;
}/*}}}*/
static int
@@ -1000,7 +1007,8 @@ SLbetween (void) /*{{{*/
argc = SLang_Num_Function_Args;
if (argc != 3) {
- SLang_Error = SL_SYNTAX_ERROR;
+ /*SLang_Error = SL_SYNTAX_ERROR;*/
+ SLang_set_error(SL_SYNTAX_ERROR);
return -1;
}
if (! (argv = type_retreive (argc)))
@@ -1030,8 +1038,9 @@ SLbetween (void) /*{{{*/
break;
}
type_release (argc, argv);
- if ((rc == -1) && (! SLang_Error))
- SLang_Error = SL_TYPE_MISMATCH;
+ if ((rc == -1) && (! SLang_get_error()))
+ /*SLang_Error = SL_TYPE_MISMATCH;*/
+ SLang_set_error(SL_TYPE_MISMATCH);
return rc;
}/*}}}*/
static void
@@ -1044,7 +1053,8 @@ SLdecode (void) /*{{{*/
argc = SLang_Num_Function_Args;
if ((argc < 4) || (argc % 2 != 0)) {
- SLang_Error = SL_SYNTAX_ERROR;
+ /*SLang_Error = SL_SYNTAX_ERROR;*/
+ SLang_set_error(SL_SYNTAX_ERROR);
return;
}
if (! (argv = type_retreive (argc)))
@@ -1068,7 +1078,8 @@ SLdecode (void) /*{{{*/
if (argv[argc - 1].type != argv[2].type)
st = false;
if (! st)
- SLang_Error = SL_TYPE_MISMATCH;
+ /*SLang_Error = SL_TYPE_MISMATCH;*/
+ SLang_set_error(SL_TYPE_MISMATCH);
else {
int hit = -1;
@@ -1092,7 +1103,8 @@ SLdecode (void) /*{{{*/
switch (argv[hit].type) {
default:
st = false;
- SLang_Error = SL_TYPE_MISMATCH;
+ /*SLang_Error = SL_TYPE_MISMATCH;*/
+ SLang_set_error(SL_TYPE_MISMATCH);
break;
case SLANG_INT_TYPE:
SLang_push_integer ((int) argv[hit].v.n);
|
