From: Jeroen van Wolffelaar <jeroen@php.net>
Date: Tue, 25 Sep 2001 22:34:57 +0000 (+0000)
Subject: Should've used my own script... 3rd try.
X-Git-Tag: POST_SUBST_Z_MACROS~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ddd124d1d58f5f1094c8287e0f3905e6ab45d40;p=php

Should've used my own script... 3rd try.
---

diff --git a/scripts/conv_z_macros b/scripts/conv_z_macros
index e2fba39829..a5d6ba7ef2 100755
--- a/scripts/conv_z_macros
+++ b/scripts/conv_z_macros
@@ -21,33 +21,33 @@
 for i in $@; do
 	echo -n "Processing $i... "
 	sed \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->type/Z_TYPE_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->type/Z_TYPE_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.type/Z_TYPE(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.dval/Z_DVAL_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.dval/Z_DVAL_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.dval/Z_DVAL(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.lval/Z_LVAL_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.lval/Z_LVAL_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.lval/Z_LVAL(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.ht/Z_ARRVAL_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.ht/Z_ARRVAL_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.ht/Z_ARRVAL(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.str\.val/Z_STRVAL_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.str\.val/Z_STRVAL_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.str\.val/Z_STRVAL(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.str\.len/Z_STRLEN_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.str\.len/Z_STRLEN_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.str\.len/Z_STRLEN(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.obj\.properties/Z_OBJPROP_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.obj\.properties/Z_OBJPROP_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.obj\.properties/Z_OBJPROP(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.obj\.ce/Z_OBJCE_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.obj\.ce/Z_OBJCE_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.obj\.ce/Z_OBJCE(\1)/g' \
-	-e 's/(\*\([a-z_][]a-z_\[]*\))->value\.obj/Z_OBJ_PP(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)->value\.obj/Z_OBJ_P(\1)/g' \
-	-e 's/\([a-z_][]a-z_\[]*\)\.value\.obj/Z_OBJ(\1)/g' \
+	-e 's/(\*\([^()]\+\))->type/Z_TYPE_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->type/Z_TYPE_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.type/Z_TYPE(\1)/g' \
+	-e 's/(\*\([^()]\+\)))->value\.dval/Z_DVAL_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.dval/Z_DVAL_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.dval/Z_DVAL(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.lval/Z_LVAL_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.lval/Z_LVAL_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.lval/Z_LVAL(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.ht/Z_ARRVAL_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.ht/Z_ARRVAL_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.ht/Z_ARRVAL(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.str\.val/Z_STRVAL_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.str\.val/Z_STRVAL_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.str\.val/Z_STRVAL(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.str\.len/Z_STRLEN_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.str\.len/Z_STRLEN_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.str\.len/Z_STRLEN(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.obj\.properties/Z_OBJPROP_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj\.properties/Z_OBJPROP_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj\.properties/Z_OBJPROP(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.obj\.ce/Z_OBJCE_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj\.ce/Z_OBJCE_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj\.ce/Z_OBJCE(\1)/g' \
+	-e 's/(\*\([^()]\+\))->value\.obj/Z_OBJ_PP(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj/Z_OBJ_P(\1)/g' \
+	-e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj/Z_OBJ(\1)/g' \
 	< $i > tmp && cp tmp $i
 	echo "DONE"
 done