checkpoint

[sbp.git] / src / edu / berkeley / sbp / tib / TibDoc.java

diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java
index 26f8174..d8f24ff 100644 (file)
--- a/src/edu/berkeley/sbp/tib/TibDoc.java
+++ b/src/edu/berkeley/sbp/tib/TibDoc.java
@@ -331,20 +331,18 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
     public static class TD {
 
         public @nonterminal static class Doc extends Dump {
-            public @arg("head") Header head;
-            public @arg("body") Body body;
+            public @arg Header head;
+            public @arg Body body;
         }
 
         public @nonterminal static class Header extends Dump {
-            public @arg("attrs") KeyVal[] attrs;
+            public @arg KeyVal[] attrs;
             // FIXME: it would be nice to be able to
             // void KeyVal(String, String) { ... } imperatively
         }
         
         public @nonterminal static class Body extends Dump {
             public Section[] sections;
-            // FIXME: it would be nice to be able to
-            // void KeyVal(String, String) { ... } imperatively
         }
         
         public @nonterminal("Section") static class Section extends Dump {
@@ -353,8 +351,8 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
         }
         
         public @nonterminal static class KeyVal extends Dump {
-            public @arg("key") String key;
-            public @arg("val") Object val;
+            public @arg String key;
+            public @arg Object val;
         }
 
         public static class Paragraph extends Dump { }