From 6300024cb387be63e802e4115b0a0bdb49a2052c Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 3 Nov 2008 10:31:28 +0100 Subject: [PATCH] add Ship.getConstant() --- src/edu/berkeley/fleet/api/Ship.java | 5 +++++ src/edu/berkeley/fleet/assembler/Parser.java | 2 +- src/edu/berkeley/fleet/two/FleetTwoDock.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/edu/berkeley/fleet/api/Ship.java b/src/edu/berkeley/fleet/api/Ship.java index dad1cb0..f5eafa4 100644 --- a/src/edu/berkeley/fleet/api/Ship.java +++ b/src/edu/berkeley/fleet/api/Ship.java @@ -24,6 +24,11 @@ public abstract class Ship implements Iterable { /** the docks of a given type are numbered; this returns the ordinal number of this dock */ public abstract int getOrdinal(); + /** get a constant associated with a ship; returns null if none found */ + public BitVector getConstant(String constantName) { + return null; + } + public String toString() { String name = getType(); name = name.substring(0,1).toLowerCase()+name.substring(1); diff --git a/src/edu/berkeley/fleet/assembler/Parser.java b/src/edu/berkeley/fleet/assembler/Parser.java index 2203220..b43c6c6 100644 --- a/src/edu/berkeley/fleet/assembler/Parser.java +++ b/src/edu/berkeley/fleet/assembler/Parser.java @@ -322,7 +322,7 @@ public class Parser { s = s.substring(0, s.indexOf('=')); hasval = true; } - ShipDescription.Constant c = ((FleetTwoDock)dd).getConstant(s); + ShipDescription.Constant c = ((FleetTwoDock)dd).getDockConstant(s); if (c==null) throw new RuntimeException("no constant " + s + " on dock " + dd); ret |= c.setbits; ret &= ~c.clearbits; diff --git a/src/edu/berkeley/fleet/two/FleetTwoDock.java b/src/edu/berkeley/fleet/two/FleetTwoDock.java index 5b7807a..3990c1d 100644 --- a/src/edu/berkeley/fleet/two/FleetTwoDock.java +++ b/src/edu/berkeley/fleet/two/FleetTwoDock.java @@ -14,7 +14,7 @@ public abstract class FleetTwoDock extends Dock { public String getName() { return dockDescription.getName(); } - public ShipDescription.Constant getConstant(String s) { return dockDescription.getConstant(s); } + public ShipDescription.Constant getDockConstant(String s) { return dockDescription.getConstant(s); } public boolean isInputDock() { return dockDescription.isInputDock(); } -- 1.7.10.4