Changeset 42 for trunk/ext/php

Timestamp:

03/19/2003 19:06:55 (6 years ago)

Author:

whythluckystiff

Message:

Updates to the PHP, Python extensions.

Location:

trunk/ext/php

Files:

• phpext.c (modified) (2 diffs)
• syck.php (modified) (1 diff)

trunk/ext/php/phpext.c

@@ -143 +143 @@
     {
         case syck_str_kind:
-                        ZVAL_STRINGL(o, n->data.str->ptr, n->data.str->len, 1);
+            if ( n->type_id == NULL || strcmp( n->type_id, "str" ) == 0 )
+            {
+                                ZVAL_STRINGL( o, n->data.str->ptr, n->data.str->len, 1);
+            }
+            else if ( strcmp( n->type_id, "null" ) == 0 )
+            {
+                ZVAL_NULL( o );
+            }
+            else if ( strcmp( n->type_id, "bool#yes" ) == 0 )
+            {
+                                ZVAL_BOOL( o, 1 );
+            }
+            else if ( strcmp( n->type_id, "bool#no" ) == 0 )
+            {
+                                ZVAL_BOOL( o, 0 );
+            }
+            else if ( strcmp( n->type_id, "int#hex" ) == 0 )
+            {
+                                long intVal = strtol( n->data.str->ptr, NULL, 16 );
+                                ZVAL_LONG( o, intVal );
+            }
+            else if ( strcmp( n->type_id, "int#oct" ) == 0 )
+            {
+                                long intVal = strtol( n->data.str->ptr, NULL, 8 );
+                                ZVAL_LONG( o, intVal );
+            }
+            else if ( strcmp( n->type_id, "int" ) == 0 )
+            {
+                                long intVal = strtol( n->data.str->ptr, NULL, 10 );
+                                ZVAL_LONG( o, intVal );
+            }
+            else if ( strcmp( n->type_id, "float" ) == 0 )
+            {
+                                //double floatVal = strtol( n->data.str->ptr );
+                                ZVAL_DOUBLE( o, 3.45 );
+            }
+            else
+            {
+                                ZVAL_STRINGL(o, n->data.str->ptr, n->data.str->len, 1);
+            }
         break;
 
@@ -193 +232 @@
     syck_parser_str( parser, arg, arg_len, NULL );
     syck_parser_handler( parser, php_syck_handler );
+    syck_parser_implicit_typing( parser, 1 );
+    syck_parser_taguri_expansion( parser, 0 );
     v = syck_parse( parser );
     syck_lookup_sym( parser, v, &obj );

trunk/ext/php/syck.php

@@ -10 +10 @@
 }
 echo "<br>\n";
-echo "Testing load: ";
-print_r( syck_load( "{test: &anc {and: 2}, or: {alias: *anc}}" ) );
+echo "Testing load: \n";
+$doc =<<<YAML
+- 
+  a: 1
+  b: 2
+  c: 3
+  d: TRUE
+  e: ~
+  f: test_me
+  g:
+    test: also
+  h: 0xFF
+  i: 012
+YAML;
+
+$iter = 10000;
+
+echo "DOC #1 = $iter x " . strlen( $doc ) . "\n";
+$syck_start = microtime();
+foreach( range( 0, $iter ) as $i )
+{
+    $test_obj = syck_load( $doc );
+}
+$syck_stop = microtime();
+
+$test_str = serialize( $test_obj );
+$unser_start = microtime();
+foreach( range( 0, $iter ) as $i )
+{
+    $test_obj = unserialize( $test_str );
+}
+$unser_stop = microtime();
+
+$doc2 = "";
+foreach( range( 0, $iter ) as $i )
+{
+    $doc2 .= $doc . "\n";
+}
+echo "DOC #2 = 1 x " . strlen( $doc2 ) . "\n";
+$syck2_start = microtime();
+$test_obj = syck_load( $doc2 );
+$syck2_stop = microtime();
+
+$test_str = serialize( $test_obj );
+$unser2_start = microtime();
+$test_obj = unserialize( $test_str );
+$unser2_stop = microtime();
+
+
+function elapsed( $start, $stop )
+{
+    $start_mt = explode( " ", $start );
+    $stop_mt = explode( " ", $stop );
+    $start_total = doubleval( $start_mt[0] ) + $start_mt[1];
+    $stop_total = doubleval( $stop_mt[0] ) + $stop_mt[1];
+    return sprintf( "%0.6f", $stop_total - $start_total );
+}
+
+echo "syck:  " . elapsed( $syck_start, $syck_stop ) . " " . elapsed( $syck2_start, $syck2_stop ) . "\n";
+echo "php:   " . elapsed( $unser_start, $unser_stop ) . " " . elapsed( $unser2_start, $unser2_stop ) . "\n";
+
 ?>