Changeset 3407

Timestamp:

Feb 13, 2008, 9:39:44 PM (13 years ago)

Author:

yura

Message:

• Simpler native.

Location:

to-imperative/trunk

Files:

• compiler/rfp_asail_java.rf (modified) (1 diff)
• java/runtime/org/refal/plus/Native.java (added)

to-imperative/trunk/compiler/rfp_asail_java.rf

@@ -527 +527 @@
   s.idx;
 
-$func ConvertTo t.javaType t.var t.convVar = e;
-$func ConvertTo2 s.javaType e.varName = e;
-
-ConvertTo2 s.javaType e.varName, {
-  s.javaType : \{"boolean"; "char"; "byte"; "short"; "int"; "long";} =
-    'Symbol.'s.javaType'Value('e.varName')';
-  '('s.javaType') (('e.varName' instanceof org.refal.plus.Reference) ? ((org.refal.plus.Reference) 'e.varName').object : 'e.varName')';
-};
-
-ConvertTo s.javaType t.var t.convVar,
+$func ConvertTo t.javaType t.var = e;
+ConvertTo s.javaType t.var,
   t.var : (s.refType e),
   s.refType : {
-    SVAR = 
-      (s.javaType' '<Rfp2Java t.convVar>' = '<ConvertTo2 s.javaType <Rfp2Java t.var>'.at(0)'>';');
+    SVAR = {
+      s.javaType : \{"boolean"; "char"; "byte"; "short"; "int"; "long";} =
+        'Symbol.'s.javaType'Value('<Rfp2Java t.var>')';
+      '('s.javaType') Symbol.objectValue('<Rfp2Java t.var>')';
+    };
     EVAR =
       <ToChars s.javaType> : e.javaElemType '[]', <ToWord e.javaElemType> :: s.javaElemType,
-      (s.javaType <Rfp2Java t.convVar>' = new 's.javaElemType'['<Rfp2Java t.var>'.length()];') 
-      ('for (int i = 0; i < '<Rfp2Java t.convVar>'.length; i++)'
-        (<Rfp2Java t.convVar>'[i] = '<ConvertTo2 s.javaElemType <Rfp2Java t.var>'.at(i)'>';')
-      );
+      '('s.javaType') Symbol.toArrayValue('<Rfp2Java t.var>', new 's.javaElemType'['<Rfp2Java t.var>'.length()];';
   };
 
-$func ConvertFrom s.javaType t.var t.convVar = e;
-$func ConvertFrom2 s.javaType e.varName = e;
-
-ConvertFrom2 s.javaType e.varName, {
-  s.javaType : \{"boolean"; "char"; "byte"; "short"; "int"; "long";} =
-    'Symbol.valueOf('e.varName')';
-  '('e.varName' instanceof java.lang.Comparable) ? ((java.lang.Comparable) 'e.varName') : new org.refal.plus.Reference<'s.javaType'>('e.varName')';
-};
+$func ConvertFrom t.var e.arg = e;
   
-ConvertFrom s.javaType t.var t.convVar,
+ConvertFrom t.var e.arg,
   t.var : (s.refType e),
   s.refType : {
-    SVAR = 
-      (<Rfp2Java t.var>'.assign('<ConvertFrom2 s.javaType <Rfp2Java t.convVar>>');');
-    EVAR =
-      <ToChars s.javaType> : e.javaElemType '[]', <ToWord e.javaElemType> :: s.javaElemType,
-      ('java.lang.Comparable[] tmp_'<Rfp2Java t.var>' = new java.lang.Comparable['<Rfp2Java t.convVar>'.length];') 
-      ('for (int i = 0; i < tmp_'<Rfp2Java t.var>'.length; i++)'
-        ('tmp_'<Rfp2Java t.var>'[i] = '<ConvertFrom2 s.javaElemType <Rfp2Java t.convVar>'[i]'>';')
-      )
-      (<Rfp2Java t.var>'.assign(tmp_'<Rfp2Java t.var>');');
+    SVAR = 'Native.sValueOf('e.arg')';
+    EVAR = 'Native.eValueOf('e.arg')';
   };
 
-WrapGen s.linkage s.tag t.qname (e.in) (e.out) e.native =
+WrapGen s.linkage FUNC t.qname (e.in) (e.out) e.native =
   <DeclarationReader <ToWord e.native>> :: s.static s.javaResType s.className s.methodName e.javaArgTypes,
-  s.tag : \{
-    FUNC  = ('void') /*empty*/;
-    "FUNC?" = ('boolean') ('return true;');
-  } :: (e.return_type) e.return =
   { <Get &Entry> : e t.qname e = <Store &Entry_Name t.qname>;; },
   { ('@RefalFormat("'<ReplaceQuotes <PrintFunctionFormat t.qname>>'")');; } :: e.refalFormat,
   <Del_Pragmas <Gener_Var_Indices 1 (<Vars e.in>) 'arg'>> : e.rfArgTypes s,
   <Del_Pragmas <Gener_Var_Indices 1 (<Vars e.out>) 'res'>> : e.rfResTypes s,
-  <Del_Pragmas <Gener_Var_Indices 1 (<Vars e.in>) 'convArg'>> : e.rfConvArgTypes s,
-  <Del_Pragmas <Gener_Var_Indices 1 (<Vars e.out>) 'convRes'>> : e.rfConvResTypes s,
-  {
-    s.methodName : "" = 'new ' s.className '(' 0;
-    s.static : "" = <Rfp2Java <L 0 e.rfConvArgTypes>> '.' s.methodName '(' 1;
-    s.className '.' s.methodName '(' 0;
+  <PrintLn 1>,
+  {
+    s.methodName : "" = 'new ' s.className 0;
+    s.static : "" = <ConvertTo s.className <L 0 e.rfArgTypes>> '.' s.methodName 1;
+    s.className '.' s.methodName 0;
   } :: e.funcHead s.shift,
-
-  {
-    s.shift : 1 = s.className e.javaArgTypes;
-    e.javaArgTypes;
-  } :: e.javaArgTypes2,
-  0 $iter e.convTo <ConvertTo <L s.num e.javaArgTypes2> <L s.num e.rfArgTypes> <L s.num e.rfConvArgTypes>> <Add s.num 1>
-    :: e.convTo s.num,
-  <Length e.rfArgTypes> : s.num =
-  
-  s.shift $iter {
-    e.vars : /**/ = <Rfp2Java <L s.shift e.rfConvArgTypes>> <Add s.shift 1>;
-    e.vars ',' <Rfp2Java <L s.shift e.rfConvArgTypes>> <Add s.shift 1>;
-  } :: e.vars s.shift, <Length e.rfConvArgTypes> : s.shift =
-  e.funcHead e.vars ');' :: v.funcCall,
-  {
-    s.methodName : "" = s.className;
-    s.javaResType;
-  } :: s.javaResType,
-  {
-    e.rfConvResTypes : /**/ = v.funcCall;
-    s.javaResType ' ' <Rfp2Java e.rfConvResTypes> ' = ' v.funcCall; 
-  } :: v.funcCall,
-  0 $iter e.convFrom <ConvertFrom s.javaResType <L s.num e.rfResTypes> <L s.num e.rfConvResTypes>> <Add s.num 1>
-    :: e.convFrom s.num,
-  <Length e.rfResTypes> : s.num =
+  <PrintLn 1>,
+  {
+    s.shift : 1 = e.rfArgTypes : t e.rfArgTypes2, e.rfArgTypes2;
+    e.rfArgTypes;
+  } :: e.rfArgTypes2,
+  <PrintLn 1>,
+  0 $iter {
+    <WriteLn s.num e.javaArgTypes e.rfArgTypes2>,
+    e.args <ConvertTo <L s.num e.javaArgTypes> <L s.num e.rfArgTypes2>> <Add s.num 1>; 
+  } :: e.args s.num,
+  <Length e.javaArgTypes> : s.num =
+  <PrintLn 3>,
+  e.funcHead '(' e.args ');' :: v.funcCall,
+  <PrintLn e.rfResTypes>,
+  e.rfResTypes : {
+    /**/ = v.funcCall';';
+    t.rfResType, (<Rfp2Java e.rfResTypes>'.assign('<ConvertFrom t.rfResType v.funcCall>');');
+  } :: e.body =
+  <PrintLn 1>,
   ()
   e.refalFormat
-  ('static '<Access_Mode s.linkage>' 'e.return_type' '
+  ('static '<Access_Mode s.linkage>' void '
   <Name_To_Java t.qname>' ('<Var_Args_To_Java Expr e.rfArgTypes Result e.rfResTypes>') throws RefalException')
-  ('{' ('try {' (e.convTo (v.funcCall) e.convFrom e.return) '} catch (java.lang.Exception e) {' ('throw new org.refal.plus.RefalException("'<Get &Module_Name>'", "'<Name_To_Java t.qname>'", e.toString());')'}') '}');
+  ('{' ('try {' (e.body) '} catch (java.lang.Exception e) {' ('throw new org.refal.plus.RefalException("'<Get &Module_Name>'", "'<Name_To_Java t.qname>'", e.toString());')'}') '}');
   /*
   {