@@ -6,7 +6,7 @@ PHP_ARG_WITH(syck, for syck support, if test "$PHP_SYCK" != "no"; then # --with-syck -> check with-path - SEARCH_PATH="/usr/local /usr" + SEARCH_PATH="/sw/local /sw /usr/local /usr" SEARCH_FOR="/include/syck.h" if test -r $PHP_SYCK/; then # path given as parameter SYCK_DIR=$PHP_SYCK @@ -42,11 +42,7 @@ if test "$PHP_SYCK" != "no"; then -L$SYCK_DIR/lib ]) - # For PHP 4.3.0: - # PHP_NEW_EXTENSION(syck, phpext.c, $ext_shared) - - # For PHP pre-4.3.0: - PHP_EXTENSION(syck, $ext_shared) + PHP_NEW_EXTENSION(syck, phpext.c, $ext_shared) PHP_SUBST(SYCK_SHARED_LIBADD) fi ext/php/config.m4 @@ -1,15 +1,15 @@ -// -// phpext.c -// -// $Author$ -// $Date$ -// -// Copyright (C) 2003 why the lucky stiff -// Copyright © 2007 Alexey Zakhlestin <indeyets@gmail.com> -// - +/** + * phpext.c + * + * $Author$ + * $Date$ + * + * Copyright (C) 2003 why the lucky stiff + * Copyright © 2007 Alexey Zakhlestin <indeyets@gmail.com> + * +**/ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include <syck.h> @@ -20,6 +20,8 @@ #include "ext/standard/info.h" #include "php_syck.h" +#define PHP_SYCK_VERSION "0.2" + #define PHP_SYCK_EXCEPTION_PARENT "UnexpectedValueException" #define PHP_SYCK_EXCEPTION_PARENT_LC "unexpectedvalueexception" #define PHP_SYCK_EXCEPTION_NAME "SyckException" @@ -49,44 +51,50 @@ PHP_SYCK_API zend_class_entry *php_syck_get_exception_base(TSRMLS_DC) static double zero() { return 0.0; } -static double one() { return 1.0; } -static double inf() { return one() / zero(); } -static double nanphp() { return zero() / zero(); } +static double one() { return 1.0; } +static double inf() { return one() / zero(); } +static double nanphp() { return zero() / zero(); } + -/* {{{ syck_functions[] - * - * Every user visible function must have an entry in syck_functions[]. - */ function_entry syck_functions[] = { - PHP_FE(syck_load, NULL) + PHP_FE(syck_load, NULL) {NULL, NULL, NULL} /* Must be the last line in syck_functions[] */ }; -/* }}} */ -/* {{{ syck_module_entry - */ +#if ZEND_MODULE_API_NO >= 20050922 +static zend_module_dep syck_deps[] = { +# ifdef HAVE_SPL + ZEND_MOD_REQUIRED("spl") +# endif + {NULL, NULL, NULL} +}; +#endif + zend_module_entry syck_module_entry = { -#if ZEND_MODULE_API_NO >= 20010901 +#if ZEND_MODULE_API_NO >= 20050922 + STANDARD_MODULE_HEADER_EX, NULL, + syck_deps, +#else STANDARD_MODULE_HEADER, #endif "syck", syck_functions, PHP_MINIT(syck), /* module init function */ - NULL, /* module shutdown function */ - NULL, /* request init function */ - NULL, /* request shutdown function */ + NULL, /* module shutdown function */ + NULL, /* request init function */ + NULL, /* request shutdown function */ PHP_MINFO(syck), /* module info function */ -#if ZEND_MODULE_API_NO >= 20010901 - "0.2", /* Replace with version number for your extension */ -#endif + PHP_SYCK_VERSION, /* Replace with version number for your extension */ STANDARD_MODULE_PROPERTIES }; -/* }}} */ + #ifdef COMPILE_DL_SYCK ZEND_GET_MODULE(syck) #endif + + /** * "Merge" class **/ @@ -113,10 +121,7 @@ static void destroy_MergeKey_resource(zend_rsrc_list_entry *resource TSRMLS_DC) **/ zend_class_entry *syck_exception_entry; -/* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ PHP_MINIT_FUNCTION(syck) { zend_class_entry ce; @@ -130,10 +135,7 @@ PHP_MINIT_FUNCTION(syck) return SUCCESS; } -/* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ PHP_MSHUTDOWN_FUNCTION(syck) { /* uncomment this line if you have INI entries @@ -141,39 +143,15 @@ PHP_MSHUTDOWN_FUNCTION(syck) */ return SUCCESS; } -/* }}} */ -/* Remove if there's nothing to do at request start */ -/* {{{ PHP_RINIT_FUNCTION - */ -PHP_RINIT_FUNCTION(syck) -{ - return SUCCESS; -} -/* }}} */ -/* Remove if there's nothing to do at request end */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ -PHP_RSHUTDOWN_FUNCTION(syck) -{ - return SUCCESS; -} -/* }}} */ - -/* {{{ PHP_MINFO_FUNCTION - */ PHP_MINFO_FUNCTION(syck) { php_info_print_table_start(); - php_info_print_table_header(2, "syck support", "enabled"); + php_info_print_table_header(2, "Extension version", PHP_SYCK_VERSION); + php_info_print_table_header(2, "Syck library version", SYCK_VERSION); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } -/* }}} */ @@ -184,97 +162,69 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n) unsigned int i; MAKE_STD_ZVAL(o); - switch (n->kind) - { + switch (n->kind) { case syck_str_kind: - 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 ) - { + 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 f; - syck_str_blow_away_commas( n ); - f = strtod( n->data.str->ptr, NULL ); - ZVAL_DOUBLE( o, f ); - } - else if ( strcmp( n->type_id, "float#nan" ) == 0 ) - { - ZVAL_DOUBLE( o, nanphp() ); - } - else if ( strcmp( n->type_id, "float#inf" ) == 0 ) - { - ZVAL_DOUBLE( o, inf() ); - } - else if ( strcmp( n->type_id, "float#neginf" ) == 0 ) - { - ZVAL_DOUBLE( o, -inf() ); - } - else if ( strcmp( n->type_id, "merge" ) == 0 ) - { + syck_str_blow_away_commas(n); + f = strtod(n->data.str->ptr, NULL); + ZVAL_DOUBLE(o, f); + } else if (strcmp(n->type_id, "float#nan") == 0) { + ZVAL_DOUBLE(o, nanphp()); + } else if (strcmp(n->type_id, "float#inf") == 0) { + ZVAL_DOUBLE(o, inf()); + } else if (strcmp(n->type_id, "float#neginf") == 0) { + ZVAL_DOUBLE(o, -inf()); + } else if (strcmp(n->type_id, "merge") == 0) { TSRMLS_FETCH(); - MAKE_STD_ZVAL( o ); - object_init_ex( o, merge_key_entry ); - } - else - { + MAKE_STD_ZVAL(o); + object_init_ex(o, merge_key_entry); + } else { ZVAL_STRINGL(o, n->data.str->ptr, n->data.str->len, 1); } break; case syck_seq_kind: array_init(o); - for ( i = 0; i < n->data.list->idx; i++ ) - { - oid = syck_seq_read( n, i ); - syck_lookup_sym( p, oid, &o2 ); - add_index_zval( o, i, o2 ); + for (i = 0; i < n->data.list->idx; i++) { + oid = syck_seq_read(n, i); + syck_lookup_sym(p, oid, (char **) &o2); + add_index_zval(o, i, o2); } break; case syck_map_kind: array_init(o); - for ( i = 0; i < n->data.pairs->idx; i++ ) - { - oid = syck_map_read( n, map_key, i ); - syck_lookup_sym( p, oid, &o2 ); - oid = syck_map_read( n, map_value, i ); - syck_lookup_sym( p, oid, &o3 ); - if ( o2->type == IS_STRING ) - { - add_assoc_zval( o, o2->value.str.val, o3 ); + for (i = 0; i < n->data.pairs->idx; i++) { + oid = syck_map_read(n, map_key, i); + syck_lookup_sym(p, oid, (char **) &o2); + oid = syck_map_read(n, map_value, i); + syck_lookup_sym(p, oid, (char **) &o3); + if (o2->type == IS_STRING) { + add_assoc_zval(o, o2->value.str.val, o3); } } break; } - oid = syck_add_sym( p, o ); + + oid = syck_add_sym(p, (char *)o); return oid; } @@ -294,29 +244,32 @@ PHP_FUNCTION(syck_load) zval *obj; SyckParser *parser; - if (ZEND_NUM_ARGS() != 1) WRONG_PARAM_COUNT; + if (ZEND_NUM_ARGS() != 1) { + WRONG_PARAM_COUNT; + } + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { return; } parser = syck_new_parser(); - syck_parser_handler( parser, php_syck_handler ); - syck_parser_error_handler( parser, php_syck_ehandler ); + syck_parser_handler(parser, php_syck_handler); + syck_parser_error_handler(parser, php_syck_ehandler); - syck_parser_implicit_typing( parser, 1 ); - syck_parser_taguri_expansion( parser, 0 ); + syck_parser_implicit_typing(parser, 1); + syck_parser_taguri_expansion(parser, 0); - syck_parser_str( parser, arg, arg_len, NULL ); + syck_parser_str(parser, arg, arg_len, NULL); - v = syck_parse( parser ); + v = syck_parse(parser); - if (1 == syck_lookup_sym( parser, v, &obj )) { + if (1 == syck_lookup_sym(parser, v, (char **) &obj)) { *return_value = *obj; zval_copy_ctor(return_value); } - syck_free_parser( parser ); + syck_free_parser(parser); } /* }}} */ ext/php/phpext.c @@ -1,4 +1,4 @@ -<? +<?php if(!extension_loaded('syck')) { dl('syck.so'); } ext/php/syck.php 68cd0c48f9faa3b8036d72eeb0ceab638552804b Alexey Zakhlestin indeyets@gmail.com http://github.com/indeyets/syck/commit/a3e7fbf9de4394fd16f5c6771a7169a8c65a2ed0 a3e7fbf9de4394fd16f5c6771a7169a8c65a2ed0 2007-03-03T16:07:45-08:00 2007-03-03T16:07:45-08:00 * Conformance to PECL-style of coding * Support for PHP 5.2 * Report versions for phpinfo() * Added casts, to block warnings cf98ea8d0d218dda63297771b17036494a694ee7 Alexey Zakhlestin indeyets@gmail.com