From 0c0805591c606d9608969e7d3814a92704bd4144 Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Wed, 20 Nov 2013 18:45:02 -0600
Subject: [PATCH] minimal working PHP tests, for h_token.

---
 src/bindings/php/TestHammer.php | 16 +++++++++++-----
 src/bindings/swig/hammer.i      |  8 ++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/bindings/php/TestHammer.php b/src/bindings/php/TestHammer.php
index 8d0a6e3..b71eb9f 100644
--- a/src/bindings/php/TestHammer.php
+++ b/src/bindings/php/TestHammer.php
@@ -8,17 +8,23 @@ class TestHammer extends PHPUnit_Framework_TestCase
 
     protected function setUp() 
     {
-        $this->parser = hammer::h_token("95\xa2", 3);
+        $this->parser = h_token("95\xa2");
     }
     public function testSuccess() 
     {
-        $result = hammer::h_parse($this->parser, "95\xa2", 3);
-        var_dump($result);
-        $this->assertEquals($result->__get("ast")->__get("token_data")->__get("bytes"), "95\xa2");
+        $result = h_parse($this->parser, "95\xa2");
+        //var_dump($result);
+        $ast = hparseresult_ast_get($result);
+        //var_dump($ast);
+        $token_data = hparsedtoken_token_data_get($ast);
+        //var_dump($token_data);
+        $bytes = htokendata_bytes_get($token_data);
+        //var_dump($bytes);
+        $this->assertEquals($bytes, "95\xa2");
     }     
     public function testFailure()
     {
-        $result = hammer::h_parse($this->parser, "95", 2);
+        $result = h_parse($this->parser, "95");
         $this->assertEquals($result, NULL);
     }
 }
diff --git a/src/bindings/swig/hammer.i b/src/bindings/swig/hammer.i
index 699019e..ead3c3f 100644
--- a/src/bindings/swig/hammer.i
+++ b/src/bindings/swig/hammer.i
@@ -140,9 +140,9 @@
   $1 = (uint8_t*)(*$input)->value.str.val;
   $2 = (*$input)->value.str.len;
  }
-%typemap(out) (uint8_t* input, size_t length) {
-  RETVAL_STRINGL((char*)$1, $2, 1);
- }
+//%typemap(out) (const uint8_t* str, const size_t len) {
+//  RETVAL_STRINGL((char*)$1, $2, 1);
+// }
 %apply (const uint8_t* str, const size_t len) { (const uint8_t* input, size_t length) }
 %typemap(in) void*[] {
 
@@ -151,7 +151,7 @@
 
  }
 %typemap(out) HBytes* {
-
+  RETVAL_STRINGL((char*)$1->token, $1->len, 1);
  }
 %typemap(out) struct HCountedArray_* {