X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Ffleet%2FMain.java;h=885e0c16727756c112c860559143878b3b99a23f;hb=94b0be86c73ee62ca09c329dbc7049c7dafa8e02;hp=42f678ff93300544e6d0b753e22d73ab943483a5;hpb=12c4f681d5323cc0557e540fba2bacc114c607de;p=fleet.git

diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java
index 42f678f..885e0c1 100644
--- a/src/edu/berkeley/fleet/Main.java
+++ b/src/edu/berkeley/fleet/Main.java
@@ -34,15 +34,7 @@ public class Main {
         }
 
         String target = options.get("target");
-        Fleet fleet;
-        if ("fpga".equals(target)) {
-            String bitfile = options.get("bitfile");
-            fleet = new Fpga();
-        } else if ("sim".equals(target) || "fleetsim".equals(target)) {
-            fleet = (Fleet)Class.forName("com.sunlabs.fleetsim.fleet.FleetDescription").newInstance();
-        } else {
-            fleet = new Interpreter();
-        }
+        Fleet fleet = Fleet.getDefaultImpl();
 
         if (!"yes".equals(options.get("verbose")))
             Log.log = null;
@@ -59,9 +51,9 @@ public class Main {
             if (name.endsWith(".ship"))
                 name = name.substring(0, name.length() - ".ship".length());
             if (fleet instanceof edu.berkeley.fleet.fpga.Fpga) {
-                ((edu.berkeley.fleet.fpga.Fpga)fleet).expand(new ShipDescription(name, new BufferedReader(new InputStreamReader(new FileInputStream(args.get(0))))));
+                ((edu.berkeley.fleet.fpga.Fpga)fleet).expand(new ShipDescription(fleet, name, new BufferedReader(new InputStreamReader(new FileInputStream(args.get(0))))));
             } else {
-                ((Interpreter)fleet).expand(new ShipDescription(name, new BufferedReader(new InputStreamReader(new FileInputStream(args.get(0))))));
+                ((Interpreter)fleet).expand(new ShipDescription(fleet, name, new BufferedReader(new InputStreamReader(new FileInputStream(args.get(0))))));
             }
 
         } else if (command.equals("doc")) {
@@ -72,7 +64,7 @@ public class Main {
             for(String ss = br.readLine(); ss!=null; ss = br.readLine())
                 pw.println(ss);
             for(String f : new File("ships").list()) {
-                new ShipDescription(f, new BufferedReader(new InputStreamReader(new FileInputStream(new File("ships/"+f))))).printTeX(pw);
+                new ShipDescription(fleet, f, new BufferedReader(new InputStreamReader(new FileInputStream(new File("ships/"+f))))).printTeX(pw);
             }
             pw.println("\\end{document}");
             pw.close();
@@ -153,7 +145,7 @@ public class Main {
         } else if (f.getPath().endsWith(".fleet") || f.getPath().endsWith(".test")) {
             runTest(fleet, new InputStreamReader(new FileInputStream(f)), f.getPath());
         } else if (f.getPath().endsWith(".ship")) {
-            ShipDescription sd = new ShipDescription(f.getName(), new BufferedReader(new InputStreamReader(new FileInputStream(f))));
+            ShipDescription sd = new ShipDescription(fleet, f.getName(), new BufferedReader(new InputStreamReader(new FileInputStream(f))));
             String testsection = sd.getSection("test");
             if (testsection == null)
                 System.out.println("no test for " + sd.getName() + "!");