changeset 622:682c8ec38d45

_code へ
author kono
date Thu, 07 Sep 2006 11:50:17 +0900
parents 9397b34d6588
children 4e08fbf6754b
files test/arg.c test/basic-code.c test/conv.c test/conv1.c test/fact-a.c test/fact.c test/func_conv_err.c test/goto.c test/longcode.c test/ret_check.c test/test1.c test/test2.c test/throw.c test/tmp1.c test/tmp2.c test/tmp4.c test/tmp6.c test/tmpa.c test/too-long-argument.c
diffstat 19 files changed, 170 insertions(+), 170 deletions(-) [+]
line wrap: on
line diff
--- a/test/arg.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/arg.c	Thu Sep 07 11:50:17 2006 +0900
@@ -5,18 +5,18 @@
 };
 
 void *exit_env;
-code (*exit_code)();
+__code (*exit___code)();
 
-code carg1(int arg0,int arg1,int arg2,int arg3,int arg4,code(*exit1)(),void *env)
+__code carg1(int arg0,int arg1,int arg2,int arg3,int arg4,__code(*exit1)(),void *env)
 {
-    printf("#0011:arg1: %d %d %d %d %d : %x %x\n",arg0,arg1,arg2,arg3,arg4,exit1==exit_code,env==exit_env);
+    printf("#0011:arg1: %d %d %d %d %d : %x %x\n",arg0,arg1,arg2,arg3,arg4,exit1==exit___code,env==exit_env);
     goto carg2(arg1,arg2,arg3,arg4,arg0,exit1,env);
 }
 
-code carg2(int arg0,int arg1,int arg2,int arg3,int arg4,code(*exit1)(),void *env)
+__code carg2(int arg0,int arg1,int arg2,int arg3,int arg4,__code(*exit1)(),void *env)
 {
     struct arg args0;
-    printf("#0018:arg1: %d %d %d %d %d : %x %x\n",arg0,arg1,arg2,arg3,arg4,exit1==exit_code,env==exit_env );
+    printf("#0018:arg1: %d %d %d %d %d : %x %x\n",arg0,arg1,arg2,arg3,arg4,exit1==exit___code,env==exit_env );
     args0.a0 = arg0;
     args0.a1 = arg1;
     args0.a2 = arg2;
@@ -25,17 +25,17 @@
     goto cargs(args0,exit1,env);
 }
 
-code cargs(struct arg args0,code exit1(),void *env)
+__code cargs(struct arg args0,__code exit1(),void *env)
 {
     printf("#0029:args: %d %d %d %d %d : %x %x\n",
 	args0.a0,args0.a1,args0.a2,args0.a3,args0.a4,
-    exit1==exit_code,env==exit_env);
+    exit1==exit___code,env==exit_env);
     // goto exit1(321),env;
     goto (*exit1)(0),env;
 }
 
 
-code carg3(struct arg args0,struct arg args1,int i, int j,int k,int l)
+__code carg3(struct arg args0,struct arg args1,int i, int j,int k,int l)
 {
     printf("#0039:args3: %d %d %d %d %d : %x %x %x %x\n",
 	args0.a0,args0.a1,args0.a2,args0.a3,args0.a4,i,j,k,l);
@@ -47,21 +47,21 @@
     goto carg4(args0,args1,j,k,l,i);
 }
 
-code carg4(struct arg args0,struct arg args1,int i, int j,int k,int l)
+__code carg4(struct arg args0,struct arg args1,int i, int j,int k,int l)
 {
     printf("#0051:args4: %d %d %d %d %d : %x %x %x %x\n",
 	args0.a0,args0.a1,args0.a2,args0.a3,args0.a4,i,j,k,l);
     goto carg5(args1,args0,j,k,l,i);
 }
 
-code carg5(struct arg args0,struct arg args1,int i, int j,int k,int l)
+__code carg5(struct arg args0,struct arg args1,int i, int j,int k,int l)
 {
     printf("#0058:args5: %d %d %d %d %d : %x %x %x %x\n",
 	args0.a0,args0.a1,args0.a2,args0.a3,args0.a4,i,j,k,l);
     goto carg6(i,j,k,l,args0);
 }
 
-code carg6(int i, int j,int k,int l,struct arg args0)
+__code carg6(int i, int j,int k,int l,struct arg args0)
 {
     printf("#0065:args6: %d %d %d %d %d : %x %x %x %x\n",
 	args0.a0,args0.a1,args0.a2,args0.a3,args0.a4,i,j,k,l);
@@ -70,7 +70,7 @@
 
 int main1(int n)
 {
-    goto carg1(0,1,2,3,4,exit_code=return,exit_env=environment);
+    goto carg1(0,1,2,3,4,exit___code=return,exit_env=environment);
     return n;
 }
 
--- a/test/basic-code.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/basic-code.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,17 +1,17 @@
 int printf(const char *format, ...);
 
-code 
+__code 
 f50(
 float a0,float a1,float a2,float a3,float a4,float a5,float a6,float a7,float a8,float a9,float a10,float a11,float a12,float a13,float a14,float a15,float a16,float a17,float a18,float a19,float a20,float a21,float a22,float a23,float a24,float a25,float a26,float a27,float a28,float a29,float a30,float a31,float a32,float a33,float a34,float a35,float a36,float a37,float a38,float a39,float a40,float a41,float a42,float a43,float a44,float a45,float a46,float a47,float a48,float a49
 );
 
 
-code 
+__code 
 d50(
 double a0,double a1,double a2,double a3,double a4,double a5,double a6,double a7,double a8,double a9,double a10,double a11,double a12,double a13,double a14,double a15,double a16,double a17,double a18,double a19,double a20,double a21,double a22,double a23,double a24,double a25,double a26,double a27,double a28,double a29,double a30,double a31,double a32,double a33,double a34,double a35,double a36,double a37,double a38,double a39,double a40,double a41,double a42,double a43,double a44,double a45,double a46,double a47,double a48,double a49
 );
 
-code 
+__code 
 i50(
 int a0,int a1,int a2,int a3,int a4,int a5,int a6,int a7,int a8,int a9,int a10,int a11,int a12,int a13,int a14,int a15,int a16,int a17,int a18,int a19,int a20,int a21,int a22,int a23,int a24,int a25,int a26,int a27,int a28,int a29,int a30,int a31,int a32,int a33,int a34,int a35,int a36,int a37,int a38,int a39,int a40,int a41,int a42,int a43,int a44,int a45,int a46,int a47,int a48,int a49
 )
@@ -29,7 +29,7 @@
 );
 }
 
-code 
+__code 
 f50(
 float a0,float a1,float a2,float a3,float a4,float a5,float a6,float a7,float a8,float a9,float a10,float a11,float a12,float a13,float a14,float a15,float a16,float a17,float a18,float a19,float a20,float a21,float a22,float a23,float a24,float a25,float a26,float a27,float a28,float a29,float a30,float a31,float a32,float a33,float a34,float a35,float a36,float a37,float a38,float a39,float a40,float a41,float a42,float a43,float a44,float a45,float a46,float a47,float a48,float a49
 )
@@ -47,7 +47,7 @@
 );
 }
 
-code 
+__code 
 d50(
 double a0,double a1,double a2,double a3,double a4,double a5,double a6,double a7,double a8,double a9,double a10,double a11,double a12,double a13,double a14,double a15,double a16,double a17,double a18,double a19,double a20,double a21,double a22,double a23,double a24,double a25,double a26,double a27,double a28,double a29,double a30,double a31,double a32,double a33,double a34,double a35,double a36,double a37,double a38,double a39,double a40,double a41,double a42,double a43,double a44,double a45,double a46,double a47,double a48,double a49
 )
@@ -63,10 +63,10 @@
     goto exit0();
 }
 
-code (*ret)(int);
+__code (*ret)(int);
 void *env;
 
-code
+__code
 exit0()
 {
     goto (*ret)(0),env;
--- a/test/conv.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/conv.c	Thu Sep 07 11:50:17 2006 +0900
@@ -14,23 +14,23 @@
 typedef char *stack;
 
 struct cont_interface { // General Return Continuation
-    code (*ret)();
+    __code (*ret)();
 };
 
-code f(int i,stack sp) {
+__code f(int i,stack sp) {
     int k,j;
     k = 3+i;
     goto f_g0(i,k,sp);
 }
 
 struct f_g0_interface {  // Specialized Return Continuation
-    code (*ret)();
+    __code (*ret)();
     int i_,k_,j_;
 };
 
-code f_g1(int j,stack sp);
+__code f_g1(int j,stack sp);
 
-code f_g0(int i,int k,stack sp) { // Caller
+__code f_g0(int i,int k,stack sp) { // Caller
     struct f_g0_interface *c = 
 	(struct f_g0_interface *)(sp -= sizeof(struct f_g0_interface));
 
@@ -41,24 +41,24 @@
     goto g(i+3,sp);
 }
 
-code f_g1(int j,stack sp) {  // Continuation 
+__code f_g1(int j,stack sp) {  // Continuation 
     struct f_g0_interface *c = sp;
     int k = c->k_;
     sp += sizeof(struct f_g0_interface);
     goto (( (struct cont_interface *)sp)->ret)(k+4+j,sp);
 }
 
-code g(int i,stack sp) {
+__code g(int i,stack sp) {
     goto (( (struct cont_interface *)sp)->ret)(i+4,sp);
 }
 
 struct main_continuation { // General Return Continuation
-    code (*ret)();
-    code (*main_ret)();
+    __code (*ret)();
+    __code (*main_ret)();
     void *env;
 };
 
-code main_return(int i,stack sp) {
+__code main_return(int i,stack sp) {
     printf("#0061:%d\n",i);
     goto (( (struct main_continuation *)sp)->main_ret)(0),
            ((struct main_continuation *)sp)->env;
--- a/test/conv1.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/conv1.c	Thu Sep 07 11:50:17 2006 +0900
@@ -32,23 +32,23 @@
 typedef char *stack;
 
 struct cont_interface { // General Return Continuation
-    code (*ret)();
+    __code (*ret)();
 };
 
-code f(int i,stack sp) {
+__code f(int i,stack sp) {
     int k,j;
     k = 3+i;
     goto f_g0(i,k,sp);
 }
 
 struct f_g0_interface {  // Specialized Return Continuation
-    code (*ret)();
+    __code (*ret)();
     int i_,k_,j_;
 };
 
-code f_g1(int j,stack sp);
+__code f_g1(int j,stack sp);
 
-code f_g0(int i,int k,stack sp) { // Caller
+__code f_g0(int i,int k,stack sp) { // Caller
     struct f_g0_interface *c = 
 	(struct f_g0_interface *)(sp -= sizeof(struct f_g0_interface));
 
@@ -59,7 +59,7 @@
     goto g(i+3,sp);
 }
 
-code f_g1(int j,stack sp) {  // Continuation 
+__code f_g1(int j,stack sp) {  // Continuation 
     struct f_g0_interface *c = sp;
     int k = c->k_;
     sp+=sizeof(struct f_g0_interface);
@@ -67,9 +67,9 @@
     goto (c->ret)(k+4+j,sp);
 }
 
-code g_h1(int j,stack sp);
+__code g_h1(int j,stack sp);
 
-code g(int i,stack sp) { // Caller
+__code g(int i,stack sp) { // Caller
     struct f_g0_interface *c = 
 	(struct f_g0_interface *)(sp -= sizeof(struct f_g0_interface));
 
@@ -79,7 +79,7 @@
     goto h(i+3,sp);
 }
 
-code g_h1(int j,stack sp) {  // Continuation 
+__code g_h1(int j,stack sp) {  // Continuation 
     struct f_g0_interface *c = sp;
     int i = c->i_;
     sp+=sizeof(struct f_g0_interface);
@@ -87,18 +87,18 @@
     goto (c->ret)(j+i,sp);
 }
 
-code h(int i,stack sp) {
+__code h(int i,stack sp) {
     struct f_g0_interface *c = sp;
     goto (c->ret)(i+4,sp);
 }
 
 struct main_continuation { // General Return Continuation
-    code (*ret)();
-    code (*main_ret)();
+    __code (*ret)();
+    __code (*main_ret)();
     void *env;
 };
 
-code main_return(int i,stack sp) {
+__code main_return(int i,stack sp) {
     if (loop-->0)
 	goto f(233,sp);
     printf("#0103:%d\n",i);
@@ -108,26 +108,26 @@
 
 /* little optimzation without stack continuation (2) */
 
-code f2(int i,char *sp) {
+__code f2(int i,char *sp) {
     int k,j;
     k = 3+i;
     goto g2(i,k,i+3,sp);
 }
 
-code g2(int i,int k,int j,char *sp) {
+__code g2(int i,int k,int j,char *sp) {
     j = j+4;
     goto h2(i,k+4+j,sp);
 }
 
-code h2_1(int i,int k,int j,char *sp) {
+__code h2_1(int i,int k,int j,char *sp) {
     goto main_return2(i+j,sp);
 }
 
-code h2(int i,int k,char *sp) {
+__code h2(int i,int k,char *sp) {
     goto h2_1(i,k,i+4,sp);
 }
 
-code main_return2(int i,stack sp) {
+__code main_return2(int i,stack sp) {
     if (loop-->0)
 	goto f2(233,sp);
     printf("#0132:%d\n",i);
@@ -137,30 +137,30 @@
 
 /* little optimizaed case (3) */
 
-code f2_1(int i,char *sp) {
+__code f2_1(int i,char *sp) {
     int k,j;
     k = 3+i;
     goto g2_1(k,i+3,sp);
 }
 
-code g2_1(int k,int i,char *sp) {
+__code g2_1(int k,int i,char *sp) {
     goto h2_11(k,i+4,sp);
 }
 
-code f2_0_1(int k,int j,char *sp);
-code h2_1_1(int i,int k,int j,char *sp) {
+__code f2_0_1(int k,int j,char *sp);
+__code h2_1_1(int i,int k,int j,char *sp) {
     goto f2_0_1(k,i+j,sp);
 }
 
-code h2_11(int i,int k,char *sp) {
+__code h2_11(int i,int k,char *sp) {
     goto h2_1_1(i,k,i+4,sp);
 }
 
-code f2_0_1(int k,int j,char *sp) {
+__code f2_0_1(int k,int j,char *sp) {
     goto (( (struct cont_interface *)sp)->ret)(k+4+j,sp);
 }
 
-code main_return2_1(int i,stack sp) {
+__code main_return2_1(int i,stack sp) {
     if (loop-->0)
         goto f2_1(233,sp);
     printf("#0165:%d\n",i);
--- a/test/fact-a.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/fact-a.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,6 +1,6 @@
 #include "stdio.h"
 
-code factorial(int n,int result,int orig,code(*print)(),code(*exit1)(), void *exit1env)
+__code factorial(int n,int result,int orig,__code(*print)(),__code(*exit1)(), void *exit1env)
 {
     if (n<0) {
 	printf("#0005:err %d!\n",n);
@@ -15,7 +15,7 @@
     }
 }
 
-code print(int n,int result,int orig,code(*print)(),code (*exit1)(),void*exit1env);
+__code print(int n,int result,int orig,__code(*print)(),__code (*exit1)(),void*exit1env);
 
 int main( int ac, char *av[])
 {
@@ -25,7 +25,7 @@
     goto factorial(n,1,n,print,return,environment);
 }
 
-code print(int n,int result,int orig,code(*print)(),code (*exit1)(),void*exit1env)
+__code print(int n,int result,int orig,__code(*print)(),__code (*exit1)(),void*exit1env)
 {
     printf("#0029:%d! = %d\n",orig, result);
     goto (*exit1)(0),exit1env;
--- a/test/fact.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/fact.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,5 +1,5 @@
 #include "stdio.h"
-code print();
+__code print();
 int
 main(ac,av)
 int ac;
@@ -11,19 +11,19 @@
     goto factorial(n,1,n,print,return,environment);
 }
 
-code print(n,result,orig,print,exit1,exit1env)
+__code print(n,result,orig,print,exit1,exit1env)
 int n,result,orig;
-code (*print)(),(*exit1)();
+__code (*print)(),(*exit1)();
 void *exit1env;
 {
     printf("#0018:%d! = %d\n",n, result);
     goto (*exit1)(0),exit1env;
 }
 
-code factorial(n,result,orig,print,exit1,exit1env)
+__code factorial(n,result,orig,print,exit1,exit1env)
 int n,result,orig;
-code (*print)();
-code (*exit1)();
+__code (*print)();
+__code (*exit1)();
 void *exit1env;
 {
     if (n<0) {
--- a/test/func_conv_err.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/func_conv_err.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,5 +1,5 @@
 
-code hoge()
+__code hoge()
 {
     goto hoge(); // ok
 }
@@ -10,25 +10,25 @@
     return 1;
 }
 
-code hoga(int i)
+__code hoga(int i)
 {
     f();   // ok
     h();   // ok h() is a function
     if (i)
 	goto f();  // bad
     else if(i-1)
-	goto g(i);  // ok g() is a code segement
+	goto g(i);  // ok g() is a __code segement
 }    //  need goto bad 
 
 int
-g(int i) {                     // g is already used as code bad
+g(int i) {                     // g is already used as __code bad
     k();
     if (i) 
 	goto h();    // bad
     // should complain.... no return value
 }
 
-code k() {                    // bad k is already used as function
+__code k() {                    // bad k is already used as function
     goto hoge();       // ok
 }
 
--- a/test/goto.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/goto.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,71 +1,71 @@
 
 
-code (*conv)(int,code (*)());
-code a2(int i,code conv());
-code a3(int i,code conv());
-code a4(int i,code conv());
-code a5(int i,code conv());
-code a6();
-code a7();
-code a8();
-code a9();
+__code (*conv)(int,__code (*)());
+__code a2(int i,__code conv());
+__code a3(int i,__code conv());
+__code a4(int i,__code conv());
+__code a5(int i,__code conv());
+__code a6();
+__code a7();
+__code a8();
+__code a9();
 
-char* print_conv(code conv());
+char* print_conv(__code conv());
 
-code (*exit0)(int);
+__code (*exit0)(int);
 void *env;
 
-code
-a2(int i,code conv())
+__code
+a2(int i,__code conv())
 {
     printf("#0020:a2 %d %s\n",i,print_conv(conv));
     goto conv(i+1,a4);
 }
 
-code
-a3(int i,code (*conv)())
+__code
+a3(int i,__code (*conv)())
 {
     printf("#0027:a3 %d %s\n",i,print_conv(conv));
     goto conv(i+1,a5);
 }
 
-code
-a4(int i,code conv())
+__code
+a4(int i,__code conv())
 {
     printf("#0034:a4 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,a6);
 }
 
-code
-a5(int i,code (*conv)())
+__code
+a5(int i,__code (*conv)())
 {
     printf("#0041:a5 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,i+2,i+3,a7);
 }
 
-code
-a6(int i,int j,int k,code conv())
+__code
+a6(int i,int j,int k,__code conv())
 {
     printf("#0048:a6 %d %s\n",i,print_conv(conv));
     goto conv(i+1,j,k,a8);
 }
 
-code
-a7(int i,,int j,int k,code (*conv)())
+__code
+a7(int i,,int j,int k,__code (*conv)())
 {
     printf("#0055:a7 %d %s\n",i,print_conv(conv));
     goto conv(i+1,j,k,a9);
 }
 
-code
-a8(int i,int j,int k,code conv())
+__code
+a8(int i,int j,int k,__code conv())
 {
     printf("#0062:a8 %d %s\n",i,print_conv(conv));
     goto (*conv)(i+1,j,k,exit0);
 }
 
-code
-a9(int i,int j,int k,code (*conv)())
+__code
+a9(int i,int j,int k,__code (*conv)())
 {
     printf("#0069:a9 %d %s\n",i,print_conv(conv));
     goto (*conv)(0),env;
@@ -79,7 +79,7 @@
 }
 
 char*
-print_conv(code conv())
+print_conv(__code conv())
 {
     if(conv==a2) return "a2";
     if(conv==a3) return "a3";
--- a/test/longcode.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/longcode.c	Thu Sep 07 11:50:17 2006 +0900
@@ -27,18 +27,18 @@
      int ccount;
 } player;
 
-code
+__code
 put_enemy_bung(
-     code(*junction)(int,teki *,player,struct move_interface),
+     __code(*junction)(int,teki *,player,struct move_interface),
      int tekino,
      teki *enemy,
      player jiki,
      struct move_interface interface);
 
-code
+__code
 move13_1(int tekino,teki *enemy,player jiki,struct move_interface interface);
 
-code
+__code
 move13(int tekino,teki *enemy,player jiki,struct move_interface interface)
 {
      if (enemy[keyenemyno].f == 0 ) {
--- a/test/ret_check.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/ret_check.c	Thu Sep 07 11:50:17 2006 +0900
@@ -2,25 +2,25 @@
 
 #ifdef __micro_c__
 
-code(*f_incl_ret)(int);
+____code(*f_incl_ret)(int);
 void *f_incl_env;
 
-code
+__code
 f_incl2(int a0)
 {   // 正しいのはコッチ
     printf("#0010:%d\n",a0);
     goto f_incl_ret(a0),f_incl_env;
 }
 
-code
+__code
 f_incl2_test(float a0)
 {   // ret先のinterface型が異なる
     printf("#0017:%g\n",a0);
     goto f_incl_ret(a0),f_incl_env;
 }
 
-code
-f_incl1(int a0,code(*ret)(int))
+__code
+f_incl1(int a0,__code(*ret)(int))
 {
     printf("#0024:%d\n",a0);
     goto ret(a0*a0);
--- a/test/test1.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/test1.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,5 +1,5 @@
 /*
-    test for CbC converted code from C
+    test for CbC converted __code from C
  */
 
 #include "stdio.h"
@@ -9,25 +9,25 @@
 void *stack0;      /* size of void* == 1 */
 
 struct cont_save { /* General Return Continuation */
-    code (*ret)();
+    __code (*ret)();
 };
 
 /*
-    code g(int,void *);
-    code f_g0(int ,int ,void *);
-    code f_g1(int,void *);
+    __code g(int,void *);
+    __code f_g0(int ,int ,void *);
+    __code f_g1(int,void *);
 */
 
 struct f_g0_save {  /* Specialized Return Continuation */
-    code (*ret)();
+    __code (*ret)();
     int ii,kk,jj;
 };
 
-code g(int i,void *sp) {
+__code g(int i,void *sp) {
     goto (* ((struct cont_save *)sp)->ret)(i+4,sp);
 }
 
-code f_g1(int j,void *sp) {  /* Continuation  */
+__code f_g1(int j,void *sp) {  /* Continuation  */
     int k;
     struct f_g0_save *c;
 
@@ -37,7 +37,7 @@
     goto (* ((struct cont_save *)sp)->ret)(k+4+j,sp);
 }
 
-code f(int i,void *sp) {
+__code f(int i,void *sp) {
     int k,j;
     struct f_g0_save *c;
 printf("#0042:f 0 sp: %x\n",sp-stack0);
@@ -58,14 +58,14 @@
 
 
 struct f0_save {  /* Specialized Return Continuation */
-	code (*ret)();
-	code (*exit1)();
+	__code (*ret)();
+	__code (*exit1)();
 	void *exit1env;
 	int jj;
 };
 
-code f1(int i,void *sp) ;
-code f0(int i,int j,code(*exit2)(), void *exit2env,void *sp)
+__code f1(int i,void *sp) ;
+__code f0(int i,int j,__code(*exit2)(), void *exit2env,void *sp)
 {
 	struct f0_save *c;
     printf("#0070:f0 1 sp: %x\n",sp-stack0);
@@ -80,10 +80,10 @@
 	goto f(i,sp);
 }
 
-code f1(int i,void *sp) {
+__code f1(int i,void *sp) {
 	int j;
 	int *exit2env;
-	code (*exit2)();
+	__code (*exit2)();
 	struct f0_save *c;
 
         c = sp;
@@ -110,7 +110,7 @@
     goto f0(i,j,return,environment,sp);
 }
 
-code print(int i,int j,(*exit1)(),void*exit1env)
+__code print(int i,int j,(*exit1)(),void*exit1env)
 {
     printf("#0114:%d %d\n",i,j);
     goto (*exit1)(0),exit1env;
--- a/test/test2.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/test2.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,23 +1,23 @@
 #include <stdio.h>
 int sender_bit;
 
-code (*ret)(int);
+__code (*ret)(int);
 void *env;
 
 struct packet {
         int bit;
         char *msg;
-        code (*next)();
+        __code (*next)();
 };
 
-code print_struct(struct packet pkt)
+__code print_struct(struct packet pkt)
 {
         printf("bit: %d\n", pkt.bit);
         printf("message: %s\n", pkt.msg);
         goto ret(0), env;
 }
 
-code initSender(int init_bit, struct packet pkt)
+__code initSender(int init_bit, struct packet pkt)
 {
         sender_bit = init_bit;
         pkt.next = print_struct;
--- a/test/throw.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/throw.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,7 +1,7 @@
 
 extern int printf(const char *,...);
 
-code (*ret)();
+__code (*ret)();
 void *env;
 
 #define ENVSIZE (1<<14)
@@ -14,13 +14,13 @@
     int last;
 } interface1;
 
-code
+__code
 throw2(interface1 arg,int i,int j)
 {
     goto ret(3),env;
 }
 
-code
+__code
 throw1(interface1 arg,int i,int j)
 {
     printf("%d %d %d %d %d\n",arg.last,arg.a,arg.c[99],i,j);
@@ -28,7 +28,7 @@
     goto throw2(arg,i,74);
 }
 
-code
+__code
 throw(interface1 arg,int i,int j)
 {
     char *space = (char *)malloc(ENVSIZE)+ENVSIZE;
--- a/test/tmp1.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/tmp1.c	Thu Sep 07 11:50:17 2006 +0900
@@ -1,8 +1,8 @@
 /* easy test */
 
-code (*ret)();
+__code (*ret)();
 void *env;
-code exit1(int ac);
+__code exit1(int ac);
 
 main0(ac,av)
 int ac;
@@ -18,13 +18,13 @@
     printf("#0017:main0 %d end.\n",ac);
 }
 
-code exit1(int ac)
+__code exit1(int ac)
 {
     // exit(0);
     goto code3(0,1,2,3,4,5);
 }
 
-code code3(a,b,c,d,e,f)
+__code code3(a,b,c,d,e,f)
 char a,b;
 int c,d,e,f;
 {
@@ -35,7 +35,7 @@
 	goto code4(a+3,b+3,c+3,d+3,e+3,f+3);
 }
 
-code code4(a,b,c,d,e,f)
+__code code4(a,b,c,d,e,f)
 char a,b;
 int c,d,e,f;
 {
@@ -52,19 +52,19 @@
     else goto ret(0),env;
 }
 
-code code0(ac,av,ret)
+__code code0(ac,av,ret)
 int ac;
 char *av[];
-code ret();
+__code ret();
 {
     goto code1(ac,av,ret);
 }
 
-code code1(ac,av,exit)
+__code code1(ac,av,exit)
 int ac,exit;
 char *av[];
 {
-    code (*f)(int);
+    __code (*f)(int);
     printf("#0067:code1: %d\n",ac);
     f = exit;
     if (ac>3)
--- a/test/tmp2.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/tmp2.c	Thu Sep 07 11:50:17 2006 +0900
@@ -20,9 +20,9 @@
     goto code0(av,return,environment);
 }
 
-code code0(av,ret,retenv)
+__code code0(av,ret,retenv)
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
 {
     char *p;
@@ -31,9 +31,9 @@
     goto code1(av,ret,retenv);
 }
 
-code code1(av,ret,retenv)
+__code code1(av,ret,retenv)
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
 {
     fprintf(stdout,"4: %s\n",av[0]);
--- a/test/tmp4.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/tmp4.c	Thu Sep 07 11:50:17 2006 +0900
@@ -24,10 +24,10 @@
     goto code0(i,j,k,av,return,environment);
 }
 
-code code0(i,j,k,av,ret,retenv)
+__code code0(i,j,k,av,ret,retenv)
 int i,j,k;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
 {
     char *p;
@@ -36,20 +36,20 @@
     goto code1(i,j,k,av,ret,retenv);
 }
 
-code code1(i,j,k,av,ret,retenv)
+__code code1(i,j,k,av,ret,retenv)
 int i,j,k;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
 {
     fprintf(stdout,"4: %s\n",av[0]+2);
     goto code2(i,j,k,av,ret,retenv);
 }
 
-code code2(i,j,k,av,ret,retenv)
+__code code2(i,j,k,av,ret,retenv)
 int i,j,k;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
 {
     fprintf(stdout,"5: %s\n",av[0]+2);
--- a/test/tmp6.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/tmp6.c	Thu Sep 07 11:50:17 2006 +0900
@@ -24,7 +24,7 @@
 main0(ac,av,ret,retenv)
 int ac;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
 {
     int i,j,k;
@@ -35,12 +35,12 @@
     goto code0(i,j,k,av,ret,retenv,return,environment);
 }
 
-code code0(i,j,k,av,ret,retenv,ret1,ret1env)
+__code code0(i,j,k,av,ret,retenv,ret1,ret1env)
 int i,j,k;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
-code (*ret1)();
+__code (*ret1)();
 void *ret1env;
 {
     char *p;
@@ -49,24 +49,24 @@
     goto code1(i,j,k,av,ret,retenv,ret1,ret1env);
 }
 
-code code1(i,j,k,av,ret,retenv,ret1,ret1env)
+__code code1(i,j,k,av,ret,retenv,ret1,ret1env)
 int i,j,k;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
-code (*ret1)();
+__code (*ret1)();
 void *ret1env;
 {
     fprintf(stdout,"4: %s\n",av[0]);
     goto code2(i,j,k,av,ret,retenv,ret1,ret1env);
 }
 
-code code2(i,j,k,av,ret,retenv,ret1,ret1env)
+__code code2(i,j,k,av,ret,retenv,ret1,ret1env)
 int i,j,k;
 char *av[];
-code (*ret)();
+__code (*ret)();
 void *retenv;
-code (*ret1)();
+__code (*ret1)();
 void *ret1env;
 {
     fprintf(stdout,"5: %s\n",av[0]);
--- a/test/tmpa.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/tmpa.c	Thu Sep 07 11:50:17 2006 +0900
@@ -16,11 +16,11 @@
 typedef struct{
     char  dest;
     int VF01[4];
-    code (*ret)();
+    __code (*ret)();
     void *env;
 } interface;
 
-code a0(interface a) {
+__code a0(interface a) {
     printf("#0023:%d\n",a.dest);
     goto a.ret(0),a.env;
 }
--- a/test/too-long-argument.c	Thu Sep 07 11:50:13 2006 +0900
+++ b/test/too-long-argument.c	Thu Sep 07 11:50:17 2006 +0900
@@ -2,14 +2,14 @@
 
 #undef WRONGNUMBER
 
-typedef code
+typedef __code
 (*CCC)( int f1,int f2,int f3,int f4,int f5,int f6,int f7,int f8,int f9,int fa,int fb,int fc,int fd,int fe,int ff,
-	code(*ret)(int),
+	__code(*ret)(int),
 	void *env);
 
-code
+__code
 tcode2( int f1,int f2,int f3,int f4,int f5,int f6,int f7,int f8,int f9,int fa,int fb,int fc,int fd,int fe,int ff,
-	code(*ret)(int),
+	__code(*ret)(int),
 	void *env)
 {
 fprintf(stdout,"tcode2: f1=%d,f2=%d,f3=%d,f4=%d,f5=%d,f6=%d,f7=%d,f8=%d,f9=%d,fa=%d,fb=%d,fc=%d,fd=%d,fe=%d,ff=%d\n",
@@ -17,10 +17,10 @@
      goto ret(0),env;
 }
 
-code
+__code
 tcode1(f1,f2,f3,f4,f5,f6,f7,f8,f9,fa,fb,fc,fd,fe,ff,ret,env)
 	int f1,f2,f3,f4,f5,f6,f7,f8,f9,fa,fb,fc,fd,fe,ff;
-	code(*ret)(int);
+	__code(*ret)(int);
 	void *env;
 {
 fprintf(stdout,"tcode1: f1=%d,f2=%d,f3=%d,f4=%d,f5=%d,f6=%d,f7=%d,f8=%d,f9=%d,fa=%d,fb=%d,fc=%d,fd=%d,fe=%d,ff=%d\n",
@@ -28,8 +28,8 @@
      goto ret(0),env;
 }
 
-code
-tcode4(int x,int y,CCC junction,code(*ret)(int),void *env)
+__code
+tcode4(int x,int y,CCC junction,__code(*ret)(int),void *env)
 {
 #ifdef WRONGNUMBER
      goto junction(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,ret,env);
@@ -38,8 +38,8 @@
 #endif
 }
 
-code
-tcode0(int x,int y,code(*junction)(int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,code(*)(int),void *),code(*ret)(int),void *env)
+__code
+tcode0(int x,int y,__code(*junction)(int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,__code(*)(int),void *),__code(*ret)(int),void *env)
 {
 #ifdef WRONGNUMBER
      goto junction(0,1,2,3,4,5,6,7,8,9,10,11,12,13,ret,env);