[Gzz-commits] gzz gzz/slices/YAMLVersionFormatter.py gzz/slic...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/08 21:33:53

Modified files:
        gzz/slices     : YAMLVersionFormatter.py YAMLVersionReader.java 
Added files:
        test/gzz/slices: parser.test 

Log message:
        Test and fixing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/slices/YAMLVersionFormatter.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/slices/YAMLVersionReader.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/slices/parser.test?rev=1.1

Patches:
Index: gzz/gzz/slices/YAMLVersionFormatter.py
diff -u gzz/gzz/slices/YAMLVersionFormatter.py:1.14 
gzz/gzz/slices/YAMLVersionFormatter.py:1.15
--- gzz/gzz/slices/YAMLVersionFormatter.py:1.14 Wed Jan  8 20:59:44 2003
+++ gzz/gzz/slices/YAMLVersionFormatter.py      Wed Jan  8 21:33:53 2003
@@ -49,19 +49,16 @@
     def readVersion(self, stream):
         reader = gzz.slices.SliceVersionReader(stream, self.mediaserver,
                                                self.enfiladeMaker)
-        return reader.readVersion()
-    
-       #struct = yaml.load(str(String(CopyUtil.readBytes(stream))))[0]
-       #print struct
-       #return SliceVersion(*parseVersion(struct, self.mediaserver, 
self.enfiladeMaker))
+        v = reader.readVersion()
+        reader.readEndOfFile()
+        return v
 
     def readDiff(self, stream):
         reader = gzz.slices.SliceVersionReader(stream, self.mediaserver,
                                                self.enfiladeMaker)
-        return reader.readDiff()
-
-       #struct = yaml.load(str(String(CopyUtil.readBytes(stream))))[0]
-       #return SliceVersion.Diff(*parseDiff(struct, self.mediaserver, 
self.enfiladeMaker))
+        d = reader.readDiff()
+        reader.readEndOfFile()
+        return d
 
 
 def dumpVersion(connections, content, ms):
Index: gzz/gzz/slices/YAMLVersionReader.java
diff -u gzz/gzz/slices/YAMLVersionReader.java:1.1 
gzz/gzz/slices/YAMLVersionReader.java:1.2
--- gzz/gzz/slices/YAMLVersionReader.java:1.1   Wed Jan  8 20:59:44 2003
+++ gzz/gzz/slices/YAMLVersionReader.java       Wed Jan  8 21:33:53 2003
@@ -164,5 +164,6 @@
            check(in.read() == '-');
 
        check(in.read() == '\n');
+       line++;
     }
 }