More todos fixed

olabini · Jul 16, 2009 · 584cdb2 · 584cdb2
1 parent c1e2fce
commit 584cdb2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/ext/ruby/src/java/org/yecht/ruby/YechtYAML.java b/ext/ruby/src/java/org/yecht/ruby/YechtYAML.java
@@ -84,8 +84,32 @@ public RubyLoadHandler(Ruby runtime) {
 
         // rb_syck_load_handler
         public long handle(Parser p, org.yecht.Node n) {
-            // TODO: implement
-            return -1;
+            YParser.Extra bonus = (YParser.Extra)p.bonus;
+            IRubyObject resolver = bonus.resolver;
+            if(resolver.isNil()) {
+                resolver = ((RubyModule)((RubyModule)runtime.getModule("YAML")).getConstant("Yecht")).getConstant("DefaultResolver");
+            }
+
+            IRubyObject _n = new RubyObject(runtime, (RubyClass)((RubyModule)((RubyModule)runtime.getModule("YAML")).getConstant("Yecht")).getConstant("Node"));
+            _n.dataWrapStruct(n);
+
+            IRubyObject obj = resolver.callMethod(runtime.getCurrentContext(), "node_import", _n);
+            if(n.id > 0 && !obj.isNil()) {
+                n.id = runtime.getObjectSpace().idOf(obj);
+                n.shortcut = obj;
+            }
+
+            if(bonus.taint) {
+                obj.setTaint(true);
+            }
+
+            if(bonus.proc != null) {
+                bonus.proc.callMethod(runtime.getCurrentContext(), "call", obj);
+            }
+
+            ((RubyHash)bonus.data).fastASet(((RubyHash)bonus.data).rb_size(), obj);
+
+            return n.id;
         }
     }
 
@@ -98,7 +122,15 @@ public RubyErrHandler(Ruby runtime) {
 
         // rb_syck_err_handler
         public void handle(Parser p, String msg) {
-            // TODO: implement
+            int endl = p.cursor;
+            while(p.buffer.buffer[endl] != 0 && p.buffer.buffer[endl] != '\n') {
+                endl++;
+            }
+            try {
+                String line = new String(p.buffer.buffer, p.lineptr, endl-p.lineptr, "ISO-8859-1");
+                String m1 = msg + " on line " + p.linect + ", col " + (p.cursor-p.lineptr) + ": `" + line + "'";
+                throw runtime.newArgumentError(m1);
+            } catch(java.io.UnsupportedEncodingException e) {}
         }
     }
 
@@ -110,9 +142,13 @@ public RubyBadAnchorHandler(Ruby runtime) {
         }
 
         // rb_syck_bad_anchor_handler
-        public org.yecht.Node handle(Parser p, String anchor) {
-            // TODO: implement
-            return null;
+        public org.yecht.Node handle(Parser p, String a) {
+            IRubyObject anchor_name = runtime.newString(a);
+            IRubyObject nm = runtime.newString("name");
+            ObjectSpace os = runtime.getObjectSpace();
+            org.yecht.Node badanc = org.yecht.Node.newMap(os.idOf(nm), os.idOf(anchor_name));
+            badanc.type_id = "tag:ruby.yaml.org,2002:object:YAML::Syck::BadAlias";
+            return badanc;
         }
     }
 

diff --git a/src/main/org/yecht/Parser.java b/src/main/org/yecht/Parser.java
@@ -21,9 +21,9 @@ private Parser() {}
     ParserInput input_type;
     IOType io_type;
     public int bufsize;
-    Pointer buffer;
-    int linectptr, lineptr, token, toktmp, cursor = -1, marker, limit;
-    int linect;
+    public Pointer buffer;
+    public int linectptr, lineptr, token, toktmp, cursor = -1, marker, limit;
+    public int linect;
     int last_token;
     int force_token;
     public boolean eof;