Changeset 3455

Timestamp:

Feb 29, 2008, 7:41:45 PM (13 years ago)

Author:

yura

Message:

• Woring Alpha version of debugger - lines are in AST.

Location:

to-imperative/trunk/compiler

Files:

• rfp_asail_cpp.rf (modified) (1 diff)
• rfp_asail_java.rf (modified) (1 diff)
• rfp_asail_jbc.rf (modified) (5 diffs)
• rfp_compile.rf (modified) (2 diffs)
• rfpc.rf (modified) (1 diff)
• rfpc.rfi (modified) (1 diff)

to-imperative/trunk/compiler/rfp_asail_cpp.rf

@@ -122 +122 @@
   e.asail : t.item e.rest, t.item : {
     (s.tag UNDEF e) = ;
+    (LINENUMBER sN) = ;
     (NATIVE s.linkage s.tag (e.name) (e.in) (e.out) e.native) =
         <Del_Pragmas <Gener_Var_Indices 1 (<Vars e.in>) 'arg'>> : e.rfArg s,

to-imperative/trunk/compiler/rfp_asail_java.rf

@@ -121 +121 @@
   e.asail : t.item e.rest, t.item : {
     (s.tag IMPORT e) = /*empty*/;
+    (LINENUMBER sN) = /*empty*/;
     (NATIVE s.linkage s.tag t.qname (e.in) (e.out) e.native) = <WrapGen s.linkage s.tag t.qname (e.in) (e.out) e.native>;
     (s.tag s.linkage t.name (e.args) (e.ress) e.body),

to-imperative/trunk/compiler/rfp_asail_jbc.rf

@@ -73 +73 @@
 $func CW = s;
 CW, <Get &CWbox> : s.cv = s.cv;
-
-$box MethodCallList;
 
 RFP_ASAIL_To_JBC (MODULE (e.moduleName) e.module) =
@@ -306 +304 @@
     t.qname : (e s.name),
     <Check_Name s.name>,
-    {
-      <Get &CallList> : e (s.name e.methodCallList) e,
-        <Store &MethodCallList e.methodCallList>;
-      <Store &MethodCallList>;
-    }, 
     <Add &ACC_STATIC <Access_Mode s.linkage>> :: s.access,
     <Function_Description (e.args) (e.ress) s.retType> :: s.desc,
@@ -367 +360 @@
 
 Body_Item_To_JBC {
+  (LINENUMBER sN) =
+    <Label> :: s.line,
+    <MVvisitLabel <MV> s.line>,
+    <MVvisitLineNumber <MV> sN s.line>;
   (DECL (INT t.var) e.expr) =
     <Bind_Var Int t.var> :: s.i,
@@ -533 +530 @@
         }, $fail;;
     },
-    {
-      <Get &MethodCallList> : s.lineNumber e.tail,
-        <Store &MethodCallList e.tail>,
-        <Label> :: s.line,
-        <MVvisitLabel <MV> s.line>,
-        <MVvisitLineNumber <MV> s.lineNumber s.line>;
-      ;
-    },
     <MVvisitMethodInsn <MV> &INVOKESTATIC <GetJBCQName e.module s.name> s.desc>,
     {
@@ -681 +670 @@
             <MVvisitVarInsn <MV> &ALOAD s.i>;
         }, $fail;;
-    },
-    {
-      <Get &MethodCallList> : s.lineNumber e.tail,
-        <Store &MethodCallList e.tail>,
-        <Label> :: s.line,
-        <MVvisitLabel <MV> s.line>,
-        <MVvisitLineNumber <MV> s.lineNumber s.line>;
-      ;
     },
     <MVvisitMethodInsn <MV> &INVOKESTATIC <GetJBCQName e.module s.name> s.desc>,

to-imperative/trunk/compiler/rfp_compile.rf

@@ -65 +65 @@
 $func Comp_Func s.linkage s.tag t.name e.params_and_body = e.compiled_func;
 
-$func Comp_Sentence e.Sentence = e.asail_sentence;
+$func Comp_Sentence s.Istail (e.fails) (e.last_Re) e.Sentence = e.asail_sentence;
 
 $func Save_Snt_State = ;
@@ -214 +214 @@
 
 Comp_Sentence s.Istail (v.fails) (e.last_Re) e.Sentence, e.Sentence : {
+  (LINENUMBER sN) e.Snt = (LINENUMBER sN) <Comp_Sentence s.Istail (v.fails) (e.last_Re) e.Snt>;
 
   /*empty*/ = /*empty*/;

to-imperative/trunk/compiler/rfpc.rf

@@ -80 +80 @@
       (e.jbcs (<ToWord <Intersperse ('/') e.java_module_name>> s.bytecode)) (e.outtail);
   } :: (e.jbcs) (e.out), e.out : /*empty*/, e.jbcs;
-
-CompileASToJBC2 t.as (e.callList) =
-  <Store &CallList e.callList>,
-  <CompileASToJBC t.as>;
 
 Main =

to-imperative/trunk/compiler/rfpc.rfi

@@ -14 +14 @@
 
 $func CompileASToJBC t.as = e.jbcs;
-$func CompileASToJBC2 t.as t.callList = e.jbcs;
-
-$box CallList;
 
 $func RFP_Pretty_Print s.channel (e.indent) e.expr = ;