Changeset 3453 for devel-tools/trunk

Timestamp:

Feb 29, 2008, 6:25:36 PM (13 years ago)

Author:

yura

Message:

• CompileASTtoJBC now returns list of byte[].
• CompilerEnvironment? no more needed (deleted).
• In rfp_src InitFromEnv? also no more needed (only commented).

File:

• devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder/RfpBuilder.java (modified) (5 diffs)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/builder/RfpBuilder.java

@@ -33 +33 @@
 import org.refal.plus.Expr;
 import org.refal.plus.Reference;
+import org.refal.plus.Result;
 import org.refal.plus.comp.FormatReader;
 import org.refal.plus.rfpdt.comp.Checker;
@@ -43 +44 @@
 
 public class RfpBuilder extends IncrementalProjectBuilder {
-    private class ExternalCompilerEnvironment implements org.refal.plus.comp.CompilerEnvironment {
-        private final IFile file;
-        private final String moduleName;
-
-        public ExternalCompilerEnvironment (IFile file) {
-            this.file = file;
-            this.moduleName = RfpBuilder.getModuleName(file);
-        }
-
-        public Reader getImplemReader () {
-            try {
-                InputStream inputStream = file.getContents();
-                String charSet = file.getCharset();
-                return new InputStreamReader(inputStream, charSet);
-            } catch (Exception e) {
-                return null;
-            }
-        }
-
-        public Reader getInterfReader (String moduleName) {
-            IFile rfiFile = getIFile(moduleName, "rfi");
-            if (rfiFile.exists()) {
-                try {
-                    InputStream inputStream = rfiFile.getContents();
-                    String charSet = rfiFile.getCharset();
-                    return new InputStreamReader(inputStream, charSet);
-                } catch (Exception e) {
-                    return null;
-                }
-            }
-
-            Reader interfReader = getRfiFileFromJar(moduleName);
-            if (interfReader == null)
-                interfReader = getInterfReaderFromClass(moduleName);
-            return interfReader;
-        }
-
-        public String getModuleName () {
-            return moduleName;
-        }
-
-        public void makeClass (String className, byte[] bytes) {
-            IFile classFile = getIFile(className, "class");
-            InputStream inputStream = new ByteArrayInputStream(bytes);
-            try {
-                classFile.create(inputStream, true, null);
-                inputStream.close();
-                classFile.setDerived(true);
-            } catch (Exception e) {
-                RfpCorePlugin.log(e);
-            }
+    private void makeClass (String className, byte[] bytes) {
+        IFile classFile = getIFile(className, "class");
+        InputStream inputStream = new ByteArrayInputStream(bytes);
+        try {
+            classFile.create(inputStream, true, null);
+            inputStream.close();
+            classFile.setDerived(true);
+        } catch (Exception e) {
+            RfpCorePlugin.log(e);
         }
     }
@@ -292 +251 @@
     }
 
+    @SuppressWarnings("unchecked")
     private void checkAndCompileModuleImplem (IResource resource) {
         if (!isRfFile(resource))
@@ -302 +262 @@
         if (environment.getMsgHandler().getErrorCount() > 0)
             return;
-        ExternalCompilerEnvironment externalCompilerEnvironment = new ExternalCompilerEnvironment(file);
-        try {
-            Expr env = new Expr(new Reference<org.refal.plus.comp.CompilerEnvironment>(externalCompilerEnvironment));
+        try {
             Expr ast = RefalASGenerator.generateAS(astImplem);
             Expr list = CallListGenerator.generateAS(astImplem);
-            org.refal.plus.compiler.rfpc.CompileASToJBC2(env, ast, list);
+            Result res = new Result();
+            org.refal.plus.compiler.rfpc.CompileASToJBC2(ast, list, res);
+            for (Comparable<?> p : res.getExpr()) {
+                Expr e = (Expr) p;
+                String name = (String) e.at(0);
+                Reference<byte[]> jbc = (Reference<byte[]>) e.at(1);
+                makeClass(name, jbc.object);
+            }
         } catch (org.refal.plus.RefalException e) {
             System.err.println(e);
@@ -487 +452 @@
     }
 
-    private Reader getRfiFileFromJar (String moduleName) {
-        ClassLoader classLoader = this.getClass().getClassLoader();
-        InputStream inputStream = classLoader.getResourceAsStream(moduleName + ".rfi");
-        return inputStream == null ? null : new InputStreamReader(inputStream);
-    }
-
-    private Reader getInterfReaderFromClass (String moduleName) {
-        String formats = null;
-        try {
-            IFile classFile = getIFile(moduleName, "class");
-            if (classFile.exists()) {
-                InputStream inputStream = classFile.getContents();
-                formats = FormatReader.ReadFormatsFromClass(inputStream);
-                inputStream.close();
-            } else {
-                ClassLoader classLoader = this.getClass().getClassLoader();
-                InputStream inputStream = classLoader.getResourceAsStream(moduleName + ".class");
-                if (inputStream != null)
-                    formats = FormatReader.ReadFormatsFromClass(inputStream);
-                inputStream.close();
-            }
-        } catch (Exception e) {
-            RfpCorePlugin.log(e);
-        }
-        return formats == null ? null : new StringReader(formats);
-    }
-
     private void incrementalBuild (IResourceDelta delta, IProgressMonitor monitor) throws CoreException {
         SortedSet<String> modulesToRecompile = collectModulesToRecompile(delta);