projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New implementation of long variable names. Each variable has a
[pspp]
/
src
/
q2c.c
diff --git
a/src/q2c.c
b/src/q2c.c
index 37ec08f033093d74f203c9560767df9032105175..a62e62d40942d9bc506e4763b41cfaca4bebf2a2 100644
(file)
--- a/
src/q2c.c
+++ b/
src/q2c.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include <assert.h>
#include <config.h>
#include <assert.h>
@@
-342,14
+342,11
@@
find_symbol (int x)
#if DEBUGGING
/* Writes a printable representation of the current token to
stdout. */
#if DEBUGGING
/* Writes a printable representation of the current token to
stdout. */
-void
+
static
void
dump_token (void)
{
switch (token)
{
dump_token (void)
{
switch (token)
{
- case T_TSTRING:
- printf ("TR_STRING\t\"%s\"\n", tokstr);
- break;
case T_STRING:
printf ("STRING\t\"%s\"\n", tokstr);
break;
case T_STRING:
printf ("STRING\t\"%s\"\n", tokstr);
break;
@@
-1461,7
+1458,7
@@
dump_specifier_parse (const specifier *spec, const subcommand *sbc)
if (s->value == VAL_INT)
{
if (s->value == VAL_INT)
{
- dump (1, "if (!lex_i
nteger_p
())");
+ dump (1, "if (!lex_i
s_integer
())");
dump (1, "{");
dump (0, "msg (SE, _(\"%s specifier of %s subcommand "
"requires an integer argument.\"));",
dump (1, "{");
dump (0, "msg (SE, _(\"%s specifier of %s subcommand "
"requires an integer argument.\"));",
@@
-1473,7
+1470,7
@@
dump_specifier_parse (const specifier *spec, const subcommand *sbc)
}
else
{
}
else
{
- dump (1, "if (
token != T_NUM
)");
+ dump (1, "if (
!lex_is_number ()
)");
dump (1, "{");
dump (0, "msg (SE, _(\"Number expected after %s "
"specifier of %s subcommand.\"));",
dump (1, "{");
dump (0, "msg (SE, _(\"Number expected after %s "
"specifier of %s subcommand.\"));",
@@
-1661,7
+1658,7
@@
dump_subcommand (const subcommand *sbc)
{
dump (1, "if (!lex_force_num ())");
dump (0, "goto lossage;");
{
dump (1, "if (!lex_force_num ())");
dump (0, "goto lossage;");
- dump (-1, "p->n_%s[p->sbc_%s - 1] = lex_
double
();",
+ dump (-1, "p->n_%s[p->sbc_%s - 1] = lex_
number
();",
st_lower (sbc->name), st_lower (sbc->name) );
dump (0, "lex_get();");
}
st_lower (sbc->name), st_lower (sbc->name) );
dump (0, "lex_get();");
}
@@
-1713,7
+1710,7
@@
dump_subcommand (const subcommand *sbc)
dump (0, "goto lossage;");
dump (-1,"}");
dump (0, "goto lossage;");
dump (-1,"}");
- dump (0, "subc_list_double_push(&p->dl_%s[p->sbc_%s-1],lex_
double
());",
+ dump (0, "subc_list_double_push(&p->dl_%s[p->sbc_%s-1],lex_
number
());",
st_lower (sbc->name),st_lower (sbc->name)
);
st_lower (sbc->name),st_lower (sbc->name)
);