Changeset 2693


Ignore:
Timestamp:
Apr 17, 2007, 2:12:14 PM (14 years ago)
Author:
yura
Message:
Location:
to-imperative/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/compiler/Makefile.bat

    r2662 r2693  
    11@echo off
    2 set JAVA_BIN=C:\Progra~1\Java\jdk1.4.2_14\bin
     2set JAVA_BIN=C:\Progra~1\Java\jdk1.5.0_11\bin
    33del *.java *.class
    44start /b /wait /belownormal java -Xss10000000 -classpath ..\java;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org.refal.plus.compiler.rfpc -B ..\lib -I ..\java -I . -java *.rf
    5 start /b /wait /belownormal %JAVA_BIN%\javac -classpath ..\java -source 1.4 *.java
     5start /b /wait /belownormal %JAVA_BIN%\javac -classpath ..\java *.java
  • to-imperative/trunk/compiler/rfp_asail_java.rf

    r2657 r2693  
    108108      { <Get &Entry> : e t.name e = <Store &Entry_Name t.name>;; },
    109109      <Store &Func_Name <Name_To_Java t.name>>,
     110      { ('@RefalFormat("'<PrintFunctionFormat t.name>'")');; } :: e.refalFormat,
    110111      ()
     112      e.refalFormat
    111113      ('static '<Access_Mode s.linkage>' 'e.return_type' '
    112114        <Get &Func_Name>' ('<Var_Args_To_Java Expr e.args Result e.ress>') throws RefalException')
  • to-imperative/trunk/compiler/rfp_asail_jbc.rf

    r2686 r2693  
    288288      <Function_Description (e.args) (e.ress) s.retType> :: s.desc,
    289289      <Store &MVbox <CWvisitMethod s.cw s.accessMode s.funcName s.desc <Null> ("org/refal/plus/RefalException")>>,
    290       <MVvisitAnnotationDefault <MV>> :: s.aw,
    291       <AnnotationVisitor.visit s.aw <Null> <WordToString "$func X e = e; ">>,
    292       <AnnotationVisitor.visitEnd s.aw>,
     290      {
     291        <PrintFunctionFormat t.name> :: e.format =
     292          <MVvisitAnnotation <MV> "Lorg/refal/plus/RefalFormat;" False> :: s.aw,
     293          <AnnotationVisitor.visit s.aw "value" <WordToString <ToWord e.format>>>,
     294          <AnnotationVisitor.visitEnd s.aw>;;
     295      },
    293296      <ASAIL_To_JBC e.body>,
    294297      s.tag : {
  • to-imperative/trunk/compiler/rfp_helper.rf

    r2638 r2693  
    22
    33$use Access Arithm Box Class Compare Convert List StdIO Table;
     4$use "rfp_compile";
    45
    56IsRFP_Debug =
     
    7778Make_Name e.origname = <Concat <MapIn &ToWord (<Separate ('.') e.origname>)>>;
    7879Print_Name e.name = <ToChars <Intersperse ('.') e.name>>;
     80
     81
     82$func PrintFormat e = e;
     83
     84PrintFormat e.format =
     85  e.format () $iter {
     86    e.format : t.item e.rest,
     87      t.item : {
     88        s.object = s.object;
     89        (CONST (e s.name)) = "&" s.name;
     90        (REF (e s.name)) = "&" s.name;
     91        (PAREN e.subformat) = "(" <PrintFormat  e.subformat> ")";
     92        (SVAR) = "s";
     93        (TVAR) = "t";
     94        (VVAR) = "v";
     95        (EVAR) = "e";
     96        e = "UNKNOWN";
     97      } :: e.subres,
     98      {
     99        e.res : /*empty*/ = e.subres;
     100        e.res " " e.subres;
     101      } :: e.res,
     102      e.rest (e.res);
     103  } :: e.format (e.res),
     104  e.format : /*empty*/ =
     105  e.res;
     106
     107PrintFunctionFormat t.name,
     108  <Lookup_Func t.name> :: s.linkage s.tag t.pragma (e.Fin) (e.Fout) =
     109  t.name : (e s.funcName),
     110  s.tag : {
     111    "FUNC" = "$func";
     112    "FUNC?" = "$func?";
     113  } :: s.funcType,
     114  <PrintFormat e.Fin> :: e.in,
     115  { e.in : /*empty*/ = /*empty*/; e.in " "; } :: e.in,
     116  <PrintFormat e.Fout> :: e.out,
     117  <ToWord s.funcType " " s.funcName " " e.in "= " e.out ";">;
  • to-imperative/trunk/compiler/rfp_helper.rfi

    r2638 r2693  
    2727// Print refal name ("a" "b" "c" -> 'a.b.c')
    2828$func Print_Name e.name = e.chars ;
     29
     30// Print refal function format ("$func F s = e;")
     31$func? PrintFunctionFormat t.name = s.format ;
  • to-imperative/trunk/java/Makefile.bat

    r2686 r2693  
    11@echo off
    2 set JAVA_BIN=C:\Progra~1\Java\jdk1.4.2_14\bin
     2set JAVA_BIN=C:\Progra~1\Java\jdk1.5.0_11\bin\
    33del org\refal\plus\*.class
    44del org\refal\plus\comp\*.class
     
    66del org\refal\plus\wrapgen\*.class
    77del refal\plus\*.class
    8 start /b /wait /belownormal %JAVA_BIN%\javac -source 1.4 org\refal\plus\*.java
    9 start /b /wait /belownormal %JAVA_BIN%\javac -source 1.4 -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org\refal\plus\comp\*.java
    10 start /b /wait /belownormal %JAVA_BIN%\javac -source 1.4 org\refal\plus\compiler\*.java
    11 start /b /wait /belownormal %JAVA_BIN%\javac -source 1.4 -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org\refal\plus\wrapgen\*.java
    12 start /b /wait /belownormal %JAVA_BIN%\javac -source 1.4 refal\plus\*.java
     8start /b /wait /belownormal %JAVA_BIN%\javac -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org\refal\plus\*.java
     9start /b /wait /belownormal %JAVA_BIN%\javac -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org\refal\plus\comp\*.java
     10start /b /wait /belownormal %JAVA_BIN%\javac -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org\refal\plus\compiler\*.java
     11start /b /wait /belownormal %JAVA_BIN%\javac -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar org\refal\plus\wrapgen\*.java
     12start /b /wait /belownormal %JAVA_BIN%\javac -classpath .;C:\Progra~1\Java\asm-3.0\lib\asm-3.0.jar refal\plus\*.java
    1313
Note: See TracChangeset for help on using the changeset viewer.