Changeset 691 for trunk/ext

Timestamp:

12/11/07 23:53:59 (1 year ago)

Author:

laurentj

Message:

ticket #317: main patch for the new action selector format. p=Thibault Piront and me

Files:

• trunk/ext/jelix/jelix.c (modified) (3 diffs)
• trunk/ext/jelix/jelix.c (modified) (3 diffs)
• trunk/ext/jelix/php_jelix.h (modified) (1 diff)
• trunk/ext/jelix/php_jelix.h (modified) (1 diff)
• trunk/ext/jelix/tests/scan_action_sel_001.phpt (modified) (50 diffs)
• trunk/ext/jelix/tests/scan_action_sel_001.phpt (modified) (50 diffs)
• trunk/ext/jelix/tests/scan_action_sel_002.phpt (modified) (1 diff)
• trunk/ext/jelix/tests/scan_action_sel_002.phpt (modified) (1 diff)
• trunk/ext/jelix/tests/scan_old_action_sel_001.phpt (added)
• trunk/ext/jelix/tests/scan_old_action_sel_001.phpt (added)
• trunk/ext/jelix/tests/scan_old_action_sel_002.phpt (added)
• trunk/ext/jelix/tests/scan_old_action_sel_002.phpt (added)

trunk/ext/jelix/jelix.c

@@ -33 +33 @@
-        PHP_FE(jelix_scan_module_sel,  NULL)
-        PHP_FE(jelix_scan_action_sel,  NULL)
+        PHP_FE(jelix_scan_old_action_sel,  NULL)
-        PHP_FE(jelix_scan_class_sel,  NULL)
-        PHP_FE(jelix_scan_locale_sel,  NULL)
@@ -412 +413 @@
-/^(?:([a-zA-Z0-9_\.]+|\#)~)?([a-zA-Z0-9_]+|\#)?(?:@([a-zA-Z0-9_]+))?$/
-*/
-
+old_
-{
-    zval **selectorStr, **objectArg, **defaultActionArg;
@@ -651 +652 @@
-/* }}} */
-
+
+/* {{{ proto boolean jelix_scan_action_sel(string arg, object tofill *)
+   scan a string as a jelix selector, and fill object properties with founded values 
+/^(?:([a-zA-Z0-9_\.]+|\#)~)?([a-zA-Z0-9_:]+|\#)?(?:@([a-zA-Z0-9_]+))?$/
+*/
+PHP_FUNCTION(jelix_scan_action_sel)
+{
+    zval **selectorStr, **objectArg, **defaultActionArg;
+    int length;
+    char * sel, *cursor, *module, *resource, *request;
+
+
+    if(ZEND_NUM_ARGS() != 3) {
+        ZEND_WRONG_PARAM_COUNT();
+    }
+    if (zend_get_parameters_ex(3, &selectorStr, &objectArg, &defaultActionArg) == FAILURE) {
+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot read arguments");
+        RETURN_FALSE;
+    }
+
+    if(Z_TYPE_P(*objectArg) != IS_OBJECT){
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid second argument, not an object");
+        RETURN_FALSE
+        }
+    if(Z_TYPE_P(*defaultActionArg) != IS_STRING){
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid third argument, not a string");
+        RETURN_FALSE
+        }
+
+    int module_length=0;
+    int resource_length=0;
+    int request_length=0;
+    int cursor_count=0;
+
+    convert_to_string_ex(selectorStr);
+    length = Z_STRLEN_PP(selectorStr);
+    sel = Z_STRVAL_PP(selectorStr);
+
+    cursor_count=0;
+    cursor = module = resource = sel;
+
+    int error = 0;
+    int sharpOk = 0;
+    int hasRequest=0;
+    int firstDashPos = -1;
+    int hasDot = 0;
+
+    // parse the module part
+    while(cursor_count < length){
+        if(*cursor == '~' || *cursor == '@'){
+            break;
+        }
+        if(*cursor == '#'){
+            if(sharpOk || module_length > 1){
+                RETURN_FALSE
+            }
+            sharpOk=1;
+        }else if(*cursor == '.'){
+            hasDot = 1;
+        }else if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                || ( *cursor >= 'A' && *cursor <= 'Z')
+                || ( *cursor >= '0' && *cursor <= '9')
+                || *cursor == '_' || *cursor == ':' ) || sharpOk){
+                RETURN_FALSE
+        }
+        if(*cursor == ':' && firstDashPos == -1){
+            firstDashPos = module_length;
+        }
+
+        module_length ++;
+        cursor_count ++;
+        cursor++;
+    }
+
+    if(cursor_count >= length){
+        // we don't find any '~' characters, so we have parsed the resource
+        if(hasDot) RETURN_FALSE
+
+        resource_length = module_length;
+        module_length = 0;
+    }else if( *cursor == '@'){
+        // we don't find any '~' characters, so we have parsed the resource
+        if(hasDot) RETURN_FALSE
+
+        resource_length = module_length;
+        module_length = 0;
+        hasRequest = 1;
+        // now we parse the @ section
+        cursor_count ++;
+        cursor++;
+
+        request = cursor;
+        request_length = 0;
+        while(cursor_count < length){
+            if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                || ( *cursor >= 'A' && *cursor <= 'Z')
+                || ( *cursor >= '0' && *cursor <= '9')
+                || *cursor == '_' || *cursor == ':' || *cursor == '.')){
+                RETURN_FALSE
+            }
+            request_length ++;
+            cursor_count ++;
+            cursor++;
+        }
+    }else{
+        // the string starts by a ~ : it's not really a problem, but we generate an error
+        // to keep compatibily with php version of selectors.
+        if(module_length == 0){
+            RETURN_FALSE
+        }
+        firstDashPos=-1;
+        cursor_count++;
+        cursor++;
+        resource = cursor;
+        resource_length = 0;
+        sharpOk = 0;
+        while(cursor_count < length){
+            if(*cursor == '@'){
+                break;
+            }
+
+            if(*cursor == '#'){
+                if(sharpOk || resource_length > 1){
+                    RETURN_FALSE
+                }
+                sharpOk=1;
+            }else if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                    || ( *cursor >= 'A' && *cursor <= 'Z')
+                    || ( *cursor >= '0' && *cursor <= '9')
+                    || *cursor == '_' || *cursor == ':') || sharpOk){
+                    RETURN_FALSE
+            }
+            if(*cursor == ':' && firstDashPos == -1){
+                firstDashPos = resource_length;
+            }
+
+            resource_length ++;
+            cursor_count ++;
+            cursor++;
+        }
+
+        if(*cursor == '@'){
+            hasRequest = 1;
+            cursor_count++;
+            cursor++;
+            request = cursor;
+            request_length = 0;
+            while(cursor_count < length){
+                if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                    || ( *cursor >= 'A' && *cursor <= 'Z')
+                    || ( *cursor >= '0' && *cursor <= '9')
+                    || *cursor == '_' || *cursor == '.')){
+                    RETURN_FALSE
+                }
+                request_length ++;
+                cursor_count ++;
+                cursor++;
+            }
+        }
+    }
+
+    // request shouldn't empty if there is a @
+    if(hasRequest && request_length == 0){
+        RETURN_FALSE
+    }
+
+    if(resource_length == 0){
+        zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     "default_index", sizeof("default_index")-1 TSRMLS_CC);
+        zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1, "default", sizeof("default")-1 TSRMLS_CC);
+        zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1, "index", sizeof("index")-1 TSRMLS_CC);
+    }else{
+        if(resource_length == 1 && *resource == '#'){
+           resource_length = Z_STRLEN_PP(defaultActionArg);
+           resource = Z_STRVAL_PP(defaultActionArg);
+           firstDashPos=-1;
+           int i;
+           for(i=0; i < resource_length;i++){
+                if(resource[i] == '_'){
+                    firstDashPos=i;
+                    break;
+                }
+           }
+        }
+
+        if(firstDashPos == -1){
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     "default", sizeof("default")-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     resource, resource_length TSRMLS_CC);
+
+            char *r;
+            int ld = sizeof("default:") -1;
+            int lr = ld + resource_length;
+            r= emalloc(lr+1);
+            if (r) {
+                memcpy(r, "default:", ld);
+                memcpy(r+ld, resource, resource_length);
+                r[lr] = 0;
+                zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     r, lr TSRMLS_CC);
+                efree(r);
+            }
+
+        }else if(firstDashPos == 0){
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     "default", sizeof("default")-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     resource+1, resource_length-1 TSRMLS_CC);
+
+            char *r;
+            int ld = sizeof("default") -1;
+            int lr = ld + resource_length;
+            r= emalloc(lr+1);
+            if (r) {
+                memcpy(r, "default", ld);
+                memcpy(r+ld, resource, resource_length);
+                r[lr] = 0;
+                zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     r, lr TSRMLS_CC);
+                efree(r);
+            }
+
+        }else if(firstDashPos == resource_length-1){
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     resource, resource_length-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     "index", sizeof("index")-1 TSRMLS_CC);
+            char *r;
+            int ld = sizeof("index") -1;
+            int lr = resource_length + ld;
+            r= emalloc(lr+1);
+            if (r) {
+                memcpy(r, resource, resource_length);
+                memcpy(r+resource_length, "index", ld);
+                r[lr] = 0;
+                zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     r, lr TSRMLS_CC);
+                efree(r);
+            }
+
+        }else{
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     resource, firstDashPos TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     resource+firstDashPos+1, resource_length-firstDashPos-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, resource, resource_length TSRMLS_CC);
+        }
+    }
+
+    zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "module", sizeof("module") - 1,     module, module_length TSRMLS_CC);
+    zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "request", sizeof("request") - 1,   request, request_length TSRMLS_CC);
+        RETURN_TRUE
+}
+/* }}} */
+
+
-/* {{{ proto boolean jelix_scan_class_sel(string arg, object tofill *)
-   scan a string as a jelix selector, and fill object properties with founded values 

trunk/ext/jelix/jelix.c

@@ -33 +33 @@
-        PHP_FE(jelix_scan_module_sel,  NULL)
-        PHP_FE(jelix_scan_action_sel,  NULL)
+        PHP_FE(jelix_scan_old_action_sel,  NULL)
-        PHP_FE(jelix_scan_class_sel,  NULL)
-        PHP_FE(jelix_scan_locale_sel,  NULL)
@@ -412 +413 @@
-/^(?:([a-zA-Z0-9_\.]+|\#)~)?([a-zA-Z0-9_]+|\#)?(?:@([a-zA-Z0-9_]+))?$/
-*/
-
+old_
-{
-    zval **selectorStr, **objectArg, **defaultActionArg;
@@ -651 +652 @@
-/* }}} */
-
+
+/* {{{ proto boolean jelix_scan_action_sel(string arg, object tofill *)
+   scan a string as a jelix selector, and fill object properties with founded values 
+/^(?:([a-zA-Z0-9_\.]+|\#)~)?([a-zA-Z0-9_:]+|\#)?(?:@([a-zA-Z0-9_]+))?$/
+*/
+PHP_FUNCTION(jelix_scan_action_sel)
+{
+    zval **selectorStr, **objectArg, **defaultActionArg;
+    int length;
+    char * sel, *cursor, *module, *resource, *request;
+
+
+    if(ZEND_NUM_ARGS() != 3) {
+        ZEND_WRONG_PARAM_COUNT();
+    }
+    if (zend_get_parameters_ex(3, &selectorStr, &objectArg, &defaultActionArg) == FAILURE) {
+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot read arguments");
+        RETURN_FALSE;
+    }
+
+    if(Z_TYPE_P(*objectArg) != IS_OBJECT){
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid second argument, not an object");
+        RETURN_FALSE
+        }
+    if(Z_TYPE_P(*defaultActionArg) != IS_STRING){
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid third argument, not a string");
+        RETURN_FALSE
+        }
+
+    int module_length=0;
+    int resource_length=0;
+    int request_length=0;
+    int cursor_count=0;
+
+    convert_to_string_ex(selectorStr);
+    length = Z_STRLEN_PP(selectorStr);
+    sel = Z_STRVAL_PP(selectorStr);
+
+    cursor_count=0;
+    cursor = module = resource = sel;
+
+    int error = 0;
+    int sharpOk = 0;
+    int hasRequest=0;
+    int firstDashPos = -1;
+    int hasDot = 0;
+
+    // parse the module part
+    while(cursor_count < length){
+        if(*cursor == '~' || *cursor == '@'){
+            break;
+        }
+        if(*cursor == '#'){
+            if(sharpOk || module_length > 1){
+                RETURN_FALSE
+            }
+            sharpOk=1;
+        }else if(*cursor == '.'){
+            hasDot = 1;
+        }else if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                || ( *cursor >= 'A' && *cursor <= 'Z')
+                || ( *cursor >= '0' && *cursor <= '9')
+                || *cursor == '_' || *cursor == ':' ) || sharpOk){
+                RETURN_FALSE
+        }
+        if(*cursor == ':' && firstDashPos == -1){
+            firstDashPos = module_length;
+        }
+
+        module_length ++;
+        cursor_count ++;
+        cursor++;
+    }
+
+    if(cursor_count >= length){
+        // we don't find any '~' characters, so we have parsed the resource
+        if(hasDot) RETURN_FALSE
+
+        resource_length = module_length;
+        module_length = 0;
+    }else if( *cursor == '@'){
+        // we don't find any '~' characters, so we have parsed the resource
+        if(hasDot) RETURN_FALSE
+
+        resource_length = module_length;
+        module_length = 0;
+        hasRequest = 1;
+        // now we parse the @ section
+        cursor_count ++;
+        cursor++;
+
+        request = cursor;
+        request_length = 0;
+        while(cursor_count < length){
+            if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                || ( *cursor >= 'A' && *cursor <= 'Z')
+                || ( *cursor >= '0' && *cursor <= '9')
+                || *cursor == '_' || *cursor == ':' || *cursor == '.')){
+                RETURN_FALSE
+            }
+            request_length ++;
+            cursor_count ++;
+            cursor++;
+        }
+    }else{
+        // the string starts by a ~ : it's not really a problem, but we generate an error
+        // to keep compatibily with php version of selectors.
+        if(module_length == 0){
+            RETURN_FALSE
+        }
+        firstDashPos=-1;
+        cursor_count++;
+        cursor++;
+        resource = cursor;
+        resource_length = 0;
+        sharpOk = 0;
+        while(cursor_count < length){
+            if(*cursor == '@'){
+                break;
+            }
+
+            if(*cursor == '#'){
+                if(sharpOk || resource_length > 1){
+                    RETURN_FALSE
+                }
+                sharpOk=1;
+            }else if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                    || ( *cursor >= 'A' && *cursor <= 'Z')
+                    || ( *cursor >= '0' && *cursor <= '9')
+                    || *cursor == '_' || *cursor == ':') || sharpOk){
+                    RETURN_FALSE
+            }
+            if(*cursor == ':' && firstDashPos == -1){
+                firstDashPos = resource_length;
+            }
+
+            resource_length ++;
+            cursor_count ++;
+            cursor++;
+        }
+
+        if(*cursor == '@'){
+            hasRequest = 1;
+            cursor_count++;
+            cursor++;
+            request = cursor;
+            request_length = 0;
+            while(cursor_count < length){
+                if(!( ( *cursor >= 'a' && *cursor <= 'z')
+                    || ( *cursor >= 'A' && *cursor <= 'Z')
+                    || ( *cursor >= '0' && *cursor <= '9')
+                    || *cursor == '_' || *cursor == '.')){
+                    RETURN_FALSE
+                }
+                request_length ++;
+                cursor_count ++;
+                cursor++;
+            }
+        }
+    }
+
+    // request shouldn't empty if there is a @
+    if(hasRequest && request_length == 0){
+        RETURN_FALSE
+    }
+
+    if(resource_length == 0){
+        zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     "default_index", sizeof("default_index")-1 TSRMLS_CC);
+        zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1, "default", sizeof("default")-1 TSRMLS_CC);
+        zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1, "index", sizeof("index")-1 TSRMLS_CC);
+    }else{
+        if(resource_length == 1 && *resource == '#'){
+           resource_length = Z_STRLEN_PP(defaultActionArg);
+           resource = Z_STRVAL_PP(defaultActionArg);
+           firstDashPos=-1;
+           int i;
+           for(i=0; i < resource_length;i++){
+                if(resource[i] == '_'){
+                    firstDashPos=i;
+                    break;
+                }
+           }
+        }
+
+        if(firstDashPos == -1){
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     "default", sizeof("default")-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     resource, resource_length TSRMLS_CC);
+
+            char *r;
+            int ld = sizeof("default:") -1;
+            int lr = ld + resource_length;
+            r= emalloc(lr+1);
+            if (r) {
+                memcpy(r, "default:", ld);
+                memcpy(r+ld, resource, resource_length);
+                r[lr] = 0;
+                zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     r, lr TSRMLS_CC);
+                efree(r);
+            }
+
+        }else if(firstDashPos == 0){
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     "default", sizeof("default")-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     resource+1, resource_length-1 TSRMLS_CC);
+
+            char *r;
+            int ld = sizeof("default") -1;
+            int lr = ld + resource_length;
+            r= emalloc(lr+1);
+            if (r) {
+                memcpy(r, "default", ld);
+                memcpy(r+ld, resource, resource_length);
+                r[lr] = 0;
+                zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     r, lr TSRMLS_CC);
+                efree(r);
+            }
+
+        }else if(firstDashPos == resource_length-1){
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     resource, resource_length-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     "index", sizeof("index")-1 TSRMLS_CC);
+            char *r;
+            int ld = sizeof("index") -1;
+            int lr = resource_length + ld;
+            r= emalloc(lr+1);
+            if (r) {
+                memcpy(r, resource, resource_length);
+                memcpy(r+resource_length, "index", ld);
+                r[lr] = 0;
+                zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1,     r, lr TSRMLS_CC);
+                efree(r);
+            }
+
+        }else{
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "controller", sizeof("controller") - 1,     resource, firstDashPos TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "method", sizeof("method") - 1,     resource+firstDashPos+1, resource_length-firstDashPos-1 TSRMLS_CC);
+            zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, resource, resource_length TSRMLS_CC);
+        }
+    }
+
+    zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "module", sizeof("module") - 1,     module, module_length TSRMLS_CC);
+    zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "request", sizeof("request") - 1,   request, request_length TSRMLS_CC);
+        RETURN_TRUE
+}
+/* }}} */
+
+
-/* {{{ proto boolean jelix_scan_class_sel(string arg, object tofill *)
-   scan a string as a jelix selector, and fill object properties with founded values 

trunk/ext/jelix/php_jelix.h

@@ -36 +36 @@
-PHP_FUNCTION(jelix_scan_module_sel);
-PHP_FUNCTION(jelix_scan_action_sel);
+PHP_FUNCTION(jelix_scan_old_action_sel);
-PHP_FUNCTION(jelix_scan_class_sel);
-PHP_FUNCTION(jelix_scan_locale_sel);

trunk/ext/jelix/php_jelix.h

@@ -36 +36 @@
-PHP_FUNCTION(jelix_scan_module_sel);
-PHP_FUNCTION(jelix_scan_action_sel);
+PHP_FUNCTION(jelix_scan_old_action_sel);
-PHP_FUNCTION(jelix_scan_class_sel);
-PHP_FUNCTION(jelix_scan_locale_sel);

trunk/ext/jelix/tests/scan_action_sel_001.phpt

@@ -13 +13 @@
-}
-
-_
+:
-                5=>"#~foo", 6=>"foo~#", 7=>"#~#", 8=>"@classic", 9=>"foo.bar~trucmuche@classic",
-_
+:
-                13=>"foo~#@classic", 14=>"#~#@classic",
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- );
-
@@ -52 +55 @@
-0:ok
-m=
-_
+:
-q=
-c=default
@@ -58 +61 @@
-1:ok
-m=aaa
-_
+:
-q=
-c=default
@@ -64 +67 @@
-2:ok
-m=aa_AZ123aR
-_
+:
-q=
-c=toPO
@@ -70 +73 @@
-3:ok
-m=foo.bar
-_
+:
-q=
-c=default
@@ -76 +79 @@
-4:ok
-m=
-_
+:
-q=
-c=machin
@@ -82 +85 @@
-5:ok
-m=#
-_
+:
-q=
-c=default
@@ -88 +91 @@
-6:ok
-m=foo
-_
+:
-q=
-c=machin
@@ -94 +97 @@
-7:ok
-m=#
-_
+:
-q=
-c=machin
@@ -100 +103 @@
-8:ok
-m=
-_
+:
-q=classic
-c=default
@@ -106 +109 @@
-9:ok
-m=foo.bar
-_
+:
-q=classic
-c=default
@@ -112 +115 @@
-10:ok
-m=foo.bar
-_
+:
-q=classic
-c=truc
@@ -118 +121 @@
-11:ok
-m=
-_
+:
-q=classic
-c=machin
@@ -124 +127 @@
-12:ok
-m=#
-_
+:
-q=classic
-c=default
@@ -130 +133 @@
-13:ok
-m=foo
-_
+:
-q=classic
-c=machin
@@ -136 +139 @@
-14:ok
-m=#
-_
+:
-q=classic
-c=machin
@@ -142 +145 @@
-15:ok
-m=testapp
-_
+:
-q=truc
-c=ctrl
@@ -148 +151 @@
-16:ok
-m=testapp
-_
+:
-q=truc
-c=default
@@ -154 +157 @@
-17:ok
-m=testapp
-_
+:
-q=truc
-c=default
@@ -160 +163 @@
-18:ok
-m=testapp
-_
+:
-q=truc
-c=ctrl
@@ -166 +169 @@
-19:ok
-m=testapp
-_
+:
-q=truc
-c=default
@@ -172 +175 @@
-20:ok
-m=testapp
-_
+:
-q=truc
-c=machin
@@ -178 +181 @@
-21:ok
-m=testapp
-_
+:
-q=
-c=ctrl
@@ -184 +187 @@
-22:ok
-m=testapp
-_
+:
-q=
-c=default
@@ -190 +193 @@
-23:ok
-m=testapp
-_
+:
-q=
-c=default
@@ -196 +199 @@
-24:ok
-m=testapp
-_
+:
-q=
-c=ctrl
@@ -202 +205 @@
-25:ok
-m=testapp
-_
+:
-q=
-c=default
@@ -208 +211 @@
-26:ok
-m=testapp
-_
+:
-q=
-c=machin
@@ -214 +217 @@
-27:ok
-m=#
-_
+:
-q=truc
-c=ctrl
@@ -220 +223 @@
-28:ok
-m=#
-_
+:
-q=truc
-c=default
@@ -226 +229 @@
-29:ok
-m=#
-_
+:
-q=truc
-c=default
@@ -232 +235 @@
-30:ok
-m=#
-_
+:
-q=truc
-c=ctrl
@@ -238 +241 @@
-31:ok
-m=#
-_
+:
-q=truc
-c=default
@@ -244 +247 @@
-32:ok
-m=#
-_
+:
-q=truc
-c=machin
@@ -250 +253 @@
-33:ok
-m=#
-_
+:
-q=
-c=ctrl
@@ -256 +259 @@
-34:ok
-m=#
-_
+:
-q=
-c=default
@@ -262 +265 @@
-35:ok
-m=#
-_
+:
-q=
-c=default
@@ -268 +271 @@
-36:ok
-m=#
-_
+:
-q=
-c=ctrl
@@ -274 +277 @@
-37:ok
-m=#
-_
+:
-q=
-c=default
@@ -280 +283 @@
-38:ok
-m=#
-_
+:
-q=
-c=machin
@@ -286 +289 @@
-39:ok
-m=
-_
+:
-q=truc
-c=ctrl
@@ -292 +295 @@
-40:ok
-m=
-_
+:
-q=truc
-c=default
@@ -298 +301 @@
-41:ok
-m=
-_
+:
-q=truc
-c=ctrl
@@ -304 +307 @@
-42:ok
-m=
-_
+:
-q=truc
-c=default
@@ -310 +313 @@
-43:ok
-m=
-_
+:
-q=truc
-c=machin
@@ -316 +319 @@
-44:ok
-m=
-_
+:
-q=
-c=ctrl
@@ -322 +325 @@
-45:ok
-m=
-_
+:
-q=
-c=default
@@ -328 +331 @@
-46:ok
-m=
-_
+:
-q=
-c=default
@@ -334 +337 @@
-47:ok
-m=
-_
+:
-q=
-c=ctrl
@@ -340 +343 @@
-48:ok
-m=
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/ext/jelix/tests/scan_action_sel_001.phpt

@@ -13 +13 @@
-}
-
-_
+:
-                5=>"#~foo", 6=>"foo~#", 7=>"#~#", 8=>"@classic", 9=>"foo.bar~trucmuche@classic",
-_
+:
-                13=>"foo~#@classic", 14=>"#~#@classic",
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+