Changeset 257 for trunk/ext

Timestamp:

07/03/2007 11:46:43 (17 months ago)

Author:

indeyets

Message:

started implementing emitter (doesnt work now, wait for several more commits)

Location:

trunk/ext/php

Files:

• php_syck.h (modified) (3 diffs)
• phpext.c (modified) (4 diffs)
• phpunit-tests (added)

trunk/ext/php/php_syck.h

@@ -20 +20 @@
 
 #ifndef PHP_SYCK_H
-#define PHP_SYCK_H
+# define PHP_SYCK_H
 
 extern zend_module_entry syck_module_entry;
-#define phpext_syck_ptr &syck_module_entry
+# define phpext_syck_ptr &syck_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_SYCK_API __declspec(dllexport)
-#else
-#define PHP_SYCK_API
-#endif
+# ifdef PHP_WIN32
+#  define PHP_SYCK_API __declspec(dllexport)
+# else
+#  define PHP_SYCK_API
+# endif
 
-#ifdef ZTS
-#include "TSRM.h"
-#endif
+# ifdef ZTS
+#  include "TSRM.h"
+# endif
 
 PHP_MINIT_FUNCTION(syck);
@@ -39 +39 @@
 
 PHP_FUNCTION(syck_load);
+PHP_FUNCTION(syck_dump);
 
 /* 
-        Declare any global variables you may need between the BEGIN
+        Declare any global variables you may need between the BEGIN
         and END macros here:     
 
@@ -48 +49 @@
         char *global_string;
 ZEND_END_MODULE_GLOBALS(syck)
-*/
-
-/* In every utility function you add that needs to use variables 
-   in php_syck_globals, call TSRM_FETCH(); after declaring other 
-   variables used by that function, or better yet, pass in TSRMLS_CC
-   after the last function argument and declare your utility function
-   with TSRMLS_DC after the last declared argument.  Always refer to
-   the globals in your function as SYCK_G(variable).  You are 
-   encouraged to rename these macros something shorter, see
-   examples in any other php module directory.
-*/
 
 #ifdef ZTS
-#define SYCK_G(v) TSRMG(syck_globals_id, zend_syck_globals *, v)
+# define SYCK_G(v) TSRMG(syck_globals_id, zend_syck_globals *, v)
 #else
-#define SYCK_G(v) (syck_globals.v)
+# define SYCK_G(v) (syck_globals.v)
 #endif
+*/
 
 #endif  /* PHP_SYCK_H */

trunk/ext/php/phpext.c

@@ -21 +21 @@
 #include "php_syck.h"
 
-#define PHP_SYCK_VERSION "0.2"
+#define PHP_SYCK_VERSION "0.3"
 
 /**
@@ -61 +61 @@
 static double inline nanphp()   { return zero() / zero(); }
 
+typedef struct {
+        char *output;
+        size_t output_size;
+        zval **stack;
+        unsigned char level;
+} php_syck_emitter_xtra;
+
+psex_add_output(php_syck_emitter_xtra *ptr)
+{
+        
+}
+
 
 function_entry syck_functions[] = {
         PHP_FE(syck_load, NULL)
+        PHP_FE(syck_dump, NULL)
         {NULL, NULL, NULL}      /* Must be the last line in syck_functions[] */
 };
@@ -222 +235 @@
 }
 
+void php_syck_emitter_handler(SyckEmitter *e, st_data_t data)
+{
+        
+}
+
+void php_syck_output_handler(SyckEmitter *e, char *str, long len)
+{
+        
+}
 
 /* {{{ proto object syck_load(string arg)
@@ -261 +283 @@
 
         syck_free_parser(parser);
+}
+/* }}} */
+
+
+/* {{{ proto object syck_load(string arg)
+   Convert PHP object into YAML string */
+PHP_FUNCTION(syck_dump)
+{
+        SyckEmitter *emitter;
+        emitter_extra *extra;
+        zval *ptr;
+
+        if (ZEND_NUM_ARGS() != 1) {
+                WRONG_PARAM_COUNT;
+        }
+
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &ptr) == FAILURE) {
+                return;
+        }
+
+        emitter = syck_new_emitter();
+        emitter->bonus = emalloc(sizeof(emitter_extra));
+        emitter->bonus.output = emalloc(8192);
+        emitter->bonus.output_size = 8192;
+
+        syck_emitter_handler(emitter, php_syck_emitter_handler);
+        syck_output_handler(emitter, php_syck_output_handler);
+
+        syck_emit(emitter, 0);
+        syck_emitter_flush(emitter, 0);
+
+        efree(emitter->bonus);
+        syck_free_emitter(emitter);
 }
 /* }}} */