From: adam <adam@megacz.com>
Date: Sun, 6 May 2007 08:54:04 +0000 (+0100)
Subject: resolve conflict
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=0d8bbd0e10c8004b683373524e1951daf6c9c6a4;p=fleet.git

resolve conflict
---

0d8bbd0e10c8004b683373524e1951daf6c9c6a4
diff --cc src/edu/berkeley/fleet/assembler/fleet.g
index f00912d,1d0041b..d11d42e
--- a/src/edu/berkeley/fleet/assembler/fleet.g
+++ b/src/edu/berkeley/fleet/assembler/fleet.g
@@@ -50,13 -50,13 +50,13 @@@ CodeBag        = CodeBagRef:: CodeBagNa
  
  CodeBagName         = name
  shipname            = name
 -shiptype            = Name:: [A-Z] [A-Za-z0-9\[\]_]**
 -ShipSpecificLiteral = Name:: [A-Z] [A-Z0-9\[\]_]**
 -portname            = Name:: [a-z] [A-Za-z0-9\[\]_]**
 -name                = Name:: [A-Za-z] [A-Za-z0-9\[\]_]**
 -index               = "[" [0-9]+ "]" | [0-9]+
 -int                 = [\-0-9]++
 +shiptype            = Name:: [A-Z]    ("":: [A-Za-z0-9\[\]_]**)
 +ShipSpecificLiteral = Name:: [A-Z]    ("":: [A-Z0-9\[\]_]**)
 +portname            = Name:: [a-z]    ("":: [A-Za-z0-9\[\]_]**)
 +name                = Name:: [A-Za-z] ("":: [A-Za-z0-9\[\]_]**)
 +index               = "[" ("":: [0-9]+) "]" | ("":: [0-9]+)
 +int                 = "":: [\-0-9]++
- ShipSpecific        = ShipSpecific:: "\"" ~[\"]++ "\""
+ ShipSpecific        = ShipSpecific:: "\"" (~[\"])++ "\""
  
  // the following are not part of the official FLEET syntax and are
  // specific to Adam's interpreter.