checkpoint

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

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index 8ee70ca..29181a0 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -54,6 +54,8 @@ public class Tib implements Token.Stream<CharToken> {
         }
         if (pos >= cur.size()) {
             pos = cur.iip+1;
+            _row = cur.endrow;
+            _col = cur.endcol;
             cur = cur.parent;
             if (cur==null) return null;
             return CharToken.right;
@@ -85,7 +87,8 @@ public class Tib implements Token.Stream<CharToken> {
             boolean blankLine = false;
             Block top = new Block.Root();
             for(String s = br.readLine(); s != null; s = br.readLine()) {
-                col = 0;
+                row++;
+                col=0;
                 while (s.length() > 0 &&
                        s.charAt(0) == ' ' &&
                        (!(top instanceof Block.Literal) || col < top.col)) { col++; s = s.substring(1); }
@@ -94,6 +97,8 @@ public class Tib implements Token.Stream<CharToken> {
                 while (col < top.col) {
                     if (s.startsWith("{}") && top instanceof Block.Literal && ((Block.Literal)top).braceCol == col) break;
                     blankLine = false;
+                    top.endrow = row;
+                    top.endcol = col;
                     top = top.closeIndent();
                 }
                 if (s.startsWith("{}")) {
@@ -107,16 +112,16 @@ public class Tib implements Token.Stream<CharToken> {
                 }
                 while (s.length() > 0 && s.charAt(s.length()-1)==' ') { s = s.substring(0, s.length()-1); }
                 if (col > top.col) top = new Block.Indent(top, row, col);
-                else if (blankLine) { top = top.closeIndent(); top = new Block.Indent(top, row, col); }
+                else if (blankLine) { top.endrow=row; top.endcol=col; top = top.closeIndent(); top = new Block.Indent(top, row, col); }
                 blankLine = false;
                 for(int i=0; i<s.length(); i++) {
                     top.add(s.charAt(i));
                     switch(s.charAt(i)) {
                         case '{':  top = new Block.Brace(top, row, col);   break;
-                        case '}':  top = top.closeBrace();                 break;
+                        case '}':  top.endrow=row; top.endcol=col; top = top.closeBrace();                 break;
                     }
                 }
-                top.add(' ');
+                top.add('\n');
                 top.finishWord();
             }
             // FIXME
@@ -132,6 +137,8 @@ public class Tib implements Token.Stream<CharToken> {
                       Block  parent;
         public  final int    row;
         public  final int    col;
+        public   int    endrow;
+        public   int    endcol;
         public final int iip;
         private final Vector children = new Vector();
         private       String pending  = "";
@@ -262,7 +269,8 @@ public class Tib implements Token.Stream<CharToken> {
 
     // Testing //////////////////////////////////////////////////////////////////////////////
 
-    public static void main(String[] s) throws Exception { System.out.println(parse(new BufferedReader(new InputStreamReader(System.in))).toString(-1)); }
+    public static void main(String[] s) throws Exception {
+        System.out.println(parse(new BufferedReader(new InputStreamReader(System.in))).toString(-1)); }
     
     // Utilities //////////////////////////////////////////////////////////////////////////////