Changeset 264

Timestamp:

07/08/2007 14:57:08 (17 months ago)

Author:

indeyets

Message:

support for sexagecimal floats

Location:

trunk/ext/php

Files:

• TODO (modified) (1 diff)
• config.m4 (modified) (2 diffs)
• phpext.c (modified) (4 diffs)
• phpunit-tests/TestLoad.php (modified) (1 diff)

trunk/ext/php/TODO

@@ -9 +9 @@
 load:
   - "Add support for datatypes":
-    - "float#base60"
     - merge
     - "timestamp#iso8601"

trunk/ext/php/config.m4

@@ -20 +20 @@
     done
   fi
-  
+
   if test -z "$SYCK_DIR"; then
     AC_MSG_RESULT([not found])
@@ -42 +42 @@
     -L$SYCK_DIR/lib
   ])
-  
+
   PHP_NEW_EXTENSION(syck, phpext.c, $ext_shared)
+  PHP_ADD_EXTENSION_DEP(syck, hash)
+  PHP_ADD_EXTENSION_DEP(syck, spl)
 
   PHP_SUBST(SYCK_SHARED_LIBADD)

trunk/ext/php/phpext.c

@@ -36 +36 @@
 {
         TSRMLS_FETCH();
-#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
+
         if (!spl_ce_RuntimeException) {
                 zend_class_entry **pce;
@@ -47 +47 @@
                 return spl_ce_RuntimeException;
         }
-#endif
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2)
-        return zend_exception_get_default();
-#else
+
         return zend_exception_get_default(TSRMLS_C);
-#endif
 }
 
@@ -129 +125 @@
 };
 
-#if ZEND_MODULE_API_NO >= 20050922
 static zend_module_dep syck_deps[] = {
-# ifdef HAVE_SPL
         ZEND_MOD_REQUIRED("spl")
-# endif
+        ZEND_MOD_REQUIRED("hash")
         {NULL, NULL, NULL}
 };
-#endif
 
 zend_module_entry syck_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
         STANDARD_MODULE_HEADER_EX, NULL,
         syck_deps,
-#else
-        STANDARD_MODULE_HEADER,
-#endif
         "syck",
         syck_functions,
@@ -275 +264 @@
 
                                 ZVAL_DOUBLE(o, f);
-                        } else if (strcmp(n->type_id, "float#sixty") == 0) {
-                                double f;
+                        } else if (strcmp(n->type_id, "float#base60") == 0) {
+                                char *ptr, *end;
+                                long multiplier = 1;
+                                double total = 0;
+
                                 syck_str_blow_away_commas(n);
-                                f = strtod(n->data.str->ptr, NULL);
-
-                                ZVAL_DOUBLE(o, f);
+                                ptr = n->data.str->ptr;
+                                end = n->data.str->ptr + n->data.str->len;
+
+                                while (end > ptr) {
+                                        double bnum = 0;
+                                        char *colon = end - 1;
+                                        while (colon >= ptr && *colon != ':') {
+                                            colon--;
+                                        }
+
+                                        if (colon >= ptr && *colon == ':')
+                                                *colon = '\0';
+
+                                        bnum = strtod(colon + 1, NULL);
+                                        total += bnum * multiplier;
+                                        multiplier *= 60;
+                                        end = colon;
+                                }
+
+                                ZVAL_DOUBLE(o, total);
                         } else if (strcmp(n->type_id, "float#nan") == 0) {
                                 ZVAL_DOUBLE(o, nanphp());

trunk/ext/php/phpunit-tests/TestLoad.php

@@ -90 +90 @@
         $this->assertSame(syck_load('99.0'), 99.0);
         $this->assertSame(syck_load('!float 99'), 99.0);
+        $this->assertSame(syck_load('190:20:30.15'), 6.8523015e+5);
     }