Author: bernhard
Date: Thu Oct 6 14:31:13 2005
New Revision: 9384
Modified:
trunk/languages/m4/src/eval.c
trunk/languages/m4/src/freeze.pir
trunk/languages/m4/src/m4.pir
Log:
Comment out deprecated ops, in order to make things compile.
Use a HERE string for the usage message.
Modified: trunk/languages/m4/src/eval.c
==============================================================================
--- trunk/languages/m4/src/eval.c (original)
+++ trunk/languages/m4/src/eval.c Thu Oct 6 14:31:13 2005
@@ -833,13 +833,13 @@ unescape(char *string)
PMC *
compile_m4_arithmetic_expression( Parrot_Interp interp, const char *program )
{
- eval_t value; /* will be returned to caller */
-
+ eval_t value; /* will be returned to caller */
struct PackFile_ByteCode *new_cs; /* generated PBC goes there */
struct PackFile_ByteCode *old_cs; /* Continue there, when new_cs is
finished */
opcode_t* program_counter;
PMC *sub;
parrot_sub_t sub_data;
+ char name[64];
/*
* The real work is done here
@@ -864,7 +864,7 @@ compile_m4_arithmetic_expression( Parrot
sprintf(name, "EVAL_" INTVAL_FMT, ++interp->code->base.pf->eval_nr);
new_cs = PF_create_default_segs(interp, name, 0);
old_cs = Parrot_switch_to_cs(interp, new_cs, 0);
- interp->imc_info->cur_namespace = NULL;
+ /* TODO gcc complains interp->imc_info->cur_namespace = NULL: */
/*
* need a packfile segment
Modified: trunk/languages/m4/src/freeze.pir
==============================================================================
--- trunk/languages/m4/src/freeze.pir (original)
+++ trunk/languages/m4/src/freeze.pir Thu Oct 6 14:31:13 2005
@@ -144,27 +144,27 @@ For now we just worry about the flags 'F
# Look for two numbers seperated by a ','
# We expect at least one digit
pos = 0
- rx_is_d content, pos, UNEXPECTED
+ # rc_ is deprecated rx_is_d content, pos, UNEXPECTED
PERHAPS_ANOTHER_DIGIT_1:
- rx_is_d content, pos, EXPECT_A_COMMA_1
+ # rc_ is deprecated rx_is_d content, pos, EXPECT_A_COMMA_1
goto PERHAPS_ANOTHER_DIGIT_1
EXPECT_A_COMMA_1:
substr token, content, 0, pos, ''
name_len = token
pos = 0
- rx_literal content, pos, ',', UNEXPECTED
+ # rx_ is deprecated rx_literal content, pos, ',', UNEXPECTED
substr content, 0, pos, ''
pos = 0
# We expect at least another digit
- rx_is_d content, pos, UNEXPECTED
+ # rc_ is deprecated rx_is_d content, pos, UNEXPECTED
PERHAPS_ANOTHER_DIGIT_2:
- rx_is_d content, pos, EXPECT_A_NEWLINE_1
+ # rc_ is deprecated rx_is_d content, pos, EXPECT_A_NEWLINE_1
goto PERHAPS_ANOTHER_DIGIT_2
EXPECT_A_NEWLINE_1:
substr token, content, 0, pos, ''
substitution_len = token
pos = 0
- rx_literal content, pos, "\n", UNEXPECTED
+ # rx_ is deprecated rx_literal content, pos, "\n", UNEXPECTED
substr content, 0, pos, ''
pos = 0
# We know the length, so we can extract the strings
@@ -180,7 +180,7 @@ For now we just worry about the flags 'F
printerr "' from frozen file not found in builtin table!\n"
BUILTIN_HAS_BEEN_HANDLED:
pos = 0
- rx_literal content, pos, "\n", UNEXPECTED
+ # rx_ is deprecated rx_literal content, pos, "\n", UNEXPECTED
substr content, 0, pos, ''
pos = 0
goto CHECK_PARSING_FINISHED
@@ -190,27 +190,27 @@ For now we just worry about the flags 'F
# Look for two numbers seperated by a ','
# We expect at least one digit
pos = 0
- rx_is_d content, pos, UNEXPECTED
+ # rc_ is deprecated rx_is_d content, pos, UNEXPECTED
PERHAPS_ANOTHER_DIGIT_3:
- rx_is_d content, pos, EXPECT_A_COMMA_2
+ # rc_ is deprecated rx_is_d content, pos, EXPECT_A_COMMA_2
goto PERHAPS_ANOTHER_DIGIT_3
EXPECT_A_COMMA_2:
substr token, content, 0, pos, ''
name_len = token
pos = 0
- rx_literal content, pos, ',', UNEXPECTED
+ # rx_ is deprecated rx_literal content, pos, ',', UNEXPECTED
substr content, 0, pos, ''
pos = 0
# We expect at least another digit
- rx_is_d content, pos, UNEXPECTED
+ # rc_ is deprecated rx_is_d content, pos, UNEXPECTED
PERHAPS_ANOTHER_DIGIT_4:
- rx_is_d content, pos, EXPECT_A_NEWLINE_2
+ # rc_ is deprecated rx_is_d content, pos, EXPECT_A_NEWLINE_2
goto PERHAPS_ANOTHER_DIGIT_4
EXPECT_A_NEWLINE_2:
substr token, content, 0, pos, ''
substitution_len = token
pos = 0
- rx_literal content, pos, "\n", UNEXPECTED
+ # rx_ is deprecated rx_literal content, pos, "\n", UNEXPECTED
substr content, 0, pos, ''
pos = 0
substr name, content, 0, name_len, ''
@@ -218,7 +218,7 @@ For now we just worry about the flags 'F
# We know the length, so we can extract the strings
define_user_macro( state, name, text )
pos = 0
- rx_literal content, pos, "\n", UNEXPECTED
+ # rx_ is deprecated rx_literal content, pos, "\n", UNEXPECTED
substr content, 0, pos, ''
pos = 0
goto CHECK_PARSING_FINISHED
Modified: trunk/languages/m4/src/m4.pir
==============================================================================
--- trunk/languages/m4/src/m4.pir (original)
+++ trunk/languages/m4/src/m4.pir Thu Oct 6 14:31:13 2005
@@ -366,19 +366,20 @@ TODO: Pass a flag for EXIT_FAILURE and E
print "Usage: ../../parrot "
print program_name
- print " [OPTION]... FILE\n"
- print "\n"
- print "Currently only long options are available.\n"
- print "\n"
- print "Operation modes:\n"
- print " --help display this help and exit\n"
- print " --version output version information and exit\n"
- print " --prefix-builtins force a `m4_' prefix to all builtins\n"
- print "\n"
- print "Frozen state files:\n"
- print " --freeze-state=FILE produce a frozen state on FILE at
end\n"
- print " --reload-state=FILE reload a frozen state from FILE at
start\n"
- print "\n"
+ print " [OPTION]... FILE\n\n"
+ print <<"END_USAGE"
+Currently only long options are available.
+
+Operation modes:
+ --help display this help and exit
+ --version output version information and exit
+ --prefix-builtins force a `m4_' prefix to all builtins
+
+Frozen state files:
+ --freeze-state=FILE produce a frozen state on FILE at end
+ --reload-state=FILE reload a frozen state from FILE at start
+
+END_USAGE
.end
