Merge pull request #21 from phalcon/development

1.0.3

Author: sergeyklay

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.2-{build}
+version: 1.0.3-{build}
 
 build: false
 environment:

CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.0.3] - 2017-05-13
+### Added
+- Make parser return error message on failure
+- Added support of `$_ENV` global var [#1224](https://github.com/phalcon/zephir/issues/1224)
+- Amended tests
+
+### Changed
+- Improved installer: use `sudo` only if `make install` fails
+
+### Fixed
+- Treat warnings as errors
+- Fix memory leak for PHP5
+
 ## [1.0.2] - 2017-04-14
 ### Added
 - Added an ability to use parentheses in for loops [#3](https://github.com/phalcon/php-zephir-parser/issues/3)
@@ -32,6 +45,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Removing unused structures
 - Removing unused variables
 
-## [1.0.0] - 2017-03-26
+## 1.0.0 - 2017-03-26
 ### Added
  - Initial stable release
+
+[Unreleased]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/phalcon/php-zephir-parser/compare/v1.0.0...v1.0.1

VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

install-development

@@ -20,8 +20,6 @@
 #  Example:
 #  ./install-development --phpize /usr/bin/phpize5.6 --php-config /usr/bin/php-config5.6
 
-set -e
-
 export ZEND_DONT_UNLOAD_MODULES=1
 export USE_ZEND_ALLOC=0
 
@@ -56,7 +54,7 @@ if [ x"$CC" == x ]; then
 	exit 1
 fi
 
-export CFLAGS="-g3 -O0 -Wall -fvisibility=hidden -march=native"
+export CFLAGS="-g3 -O0 -Wall -Werror -fvisibility=hidden"
 
 if [ x"$CC" == xclang ]; then
 	export CFLAGS="${CFLAGS} -fcolor-diagnostics"
@@ -162,11 +160,11 @@ ${PHPIZE_BIN}
 
 make -j"$(getconf _NPROCESSORS_ONLN)"
 
-make test CFLAGS="-O0 -g" NO_INTERACTION=1
+make test NO_INTERACTION=1
 
 echo
 
-sudo make install
+make install || sudo make install
 
 echo
 

parser/base.c

@@ -20,7 +20,7 @@ const xx_token_names xx_tokens[] =
 	{ XX_T_INTEGER,             "INTEGER" },
 	{ XX_T_DOUBLE,              "DOUBLE" },
 	{ XX_T_STRING,              "STRING" },
-	{ XX_T_IDENTIFIER,    		"IDENTIFIER" },
+	{ XX_T_IDENTIFIER,          "IDENTIFIER" },
 	{ XX_T_AT,                  "@" },
 	{ XX_T_COMMA,               "," },
 	{ XX_T_ASSIGN,              "=" },
@@ -72,7 +72,7 @@ static void xx_parse_with_token(void* xx_parser, int opcode, int parsercode, xx_
 /**
  * Parses a programm and returning an intermediate array representation
  */
-void xx_parse_program(zval *return_value, char *program, size_t program_length, char *file_path, zval **error_msg) {
+void xx_parse_program(zval *return_value, char *program, size_t program_length, char *file_path, zval *error_msg) {
 
 	char *error;
 	xx_scanner_state *state;
@@ -433,16 +433,15 @@ void xx_parse_program(zval *return_value, char *program, size_t program_length,
 			case XX_T_TYPE_VAR:
 				xx_(xx_parser, XX_TYPE_VAR, NULL, parser_status);
 				break;
-		    case XX_T_TYPE_OBJECT:
-                xx_(xx_parser, XX_TYPE_OBJECT, NULL, parser_status);
-                break;
-		    case XX_T_TYPE_RESOURCE:
-                xx_(xx_parser, XX_TYPE_RESOURCE, NULL, parser_status);
-                break;
-            case XX_T_TYPE_CALLABLE:
-                xx_(xx_parser, XX_TYPE_CALLABLE, NULL, parser_status);
-                break;
-
+			case XX_T_TYPE_OBJECT:
+				xx_(xx_parser, XX_TYPE_OBJECT, NULL, parser_status);
+				break;
+			case XX_T_TYPE_RESOURCE:
+				xx_(xx_parser, XX_TYPE_RESOURCE, NULL, parser_status);
+				break;
+			case XX_T_TYPE_CALLABLE:
+				xx_(xx_parser, XX_TYPE_CALLABLE, NULL, parser_status);
+				break;
 			case XX_T_ADD:
 				xx_(xx_parser, XX_ADD, NULL, parser_status);
 				break;
@@ -521,12 +520,24 @@ void xx_parse_program(zval *return_value, char *program, size_t program_length,
 
 			default:
 				parser_status->status = XX_PARSING_FAILED;
-				if (!*error_msg) {
+				if (error_msg && Z_TYPE_P(error_msg) != IS_ARRAY) {
 					int length = (48 + strlen(file_path));
 					error = emalloc(sizeof(char) * length);
 					snprintf(error, length, "Scanner: unknown opcode %d on in %s line %d", token.opcode, file_path, state->active_line);
-					//ZVAL_STRING(*error_msg, error, 1);
+				
+					array_init(error_msg);
+#if PHP_VERSION_ID >= 70000
+					add_assoc_string(error_msg, "type", "error");
+					add_assoc_string(error_msg, "message", error);
+					add_assoc_string(error_msg, "file", state->active_file);
 					efree(error);
+#else
+					add_assoc_string(error_msg, "type", "error", 1);
+					add_assoc_string(error_msg, "message", error, 0);
+					add_assoc_string(error_msg, "file", state->active_file, 1);
+#endif
+					add_assoc_long(error_msg, "line", state->active_line);
+					add_assoc_long(error_msg, "char", state->active_char);
 				}
 				break;
 		}
@@ -543,20 +554,27 @@ void xx_parse_program(zval *return_value, char *program, size_t program_length,
 		switch (scanner_status) {
 			case XX_SCANNER_RETCODE_ERR:
 			case XX_SCANNER_RETCODE_IMPOSSIBLE:
-				{
+				if (error_msg && Z_TYPE_P(error_msg) == IS_NULL) {
 					error = emalloc(sizeof(char) * 1024);
 					if (state->start) {
 						snprintf(error, 1024, "Scanner error: %d %s", scanner_status, state->start);
 					} else {
 						snprintf(error, 1024, "Scanner error: %d", scanner_status);
 					}
-#if PHP_VERSION_ID < 70000
-					ALLOC_INIT_ZVAL(*error_msg);
-					ZVAL_STRING(*error_msg, error, 1);
+
+					array_init(error_msg);
+#if PHP_VERSION_ID >= 70000
+					add_assoc_string(error_msg, "type", "error");
+					add_assoc_string(error_msg, "message", error);
+					add_assoc_string(error_msg, "file", state->active_file);
+					efree(error);
 #else
-					ZVAL_STRING(*error_msg, error);
+					add_assoc_string(error_msg, "type", "error", 1);
+					add_assoc_string(error_msg, "message", error, 0);
+					add_assoc_string(error_msg, "file", state->active_file, 1);
 #endif
-					efree(error);
+					add_assoc_long(error_msg, "line", state->active_line);
+					add_assoc_long(error_msg, "char", state->active_char);
 					status = FAILURE;
 				}
 				break;
@@ -570,18 +588,31 @@ void xx_parse_program(zval *return_value, char *program, size_t program_length,
 
 	if (parser_status->status != XX_PARSING_OK) {
 		status = FAILURE;
-		if (parser_status->syntax_error) {
-#if PHP_VERSION_ID < 70000
-			if (!*error_msg) {
-				ALLOC_INIT_ZVAL(*error_msg);
-				ZVAL_STRING(*error_msg, parser_status->syntax_error, 1);
-			}
+		if (parser_status->syntax_error && error_msg && Z_TYPE_P(error_msg) != IS_ARRAY) {
+			array_init(error_msg);
+#if PHP_VERSION_ID >= 70000
+			add_assoc_string(error_msg, "type", "error");
+			add_assoc_string(error_msg, "message", parser_status->syntax_error);
+			add_assoc_string(error_msg, "file", state->active_file);
+			efree(parser_status->syntax_error);
 #else
-			if (Z_TYPE_P(*error_msg) == IS_UNDEF) {
-				ZVAL_STRING(*error_msg, parser_status->syntax_error);
-			}
+			add_assoc_string(error_msg, "type", "error", 1);
+			add_assoc_string(error_msg, "message", parser_status->syntax_error, 0);
+			add_assoc_string(error_msg, "file", state->active_file, 1);
+#endif
+			add_assoc_long(error_msg, "line", state->active_line);
+			add_assoc_long(error_msg, "char", state->active_char);
+
+			parser_status->syntax_error = NULL;
+		}
+		else if (error_msg && Z_TYPE_P(error_msg) != IS_ARRAY) {
+#if PHP_VERSION_ID >= 70000
+			assert(Z_TYPE(parser_status->ret) == IS_ARRAY);
+			ZVAL_ZVAL(error_msg, &parser_status->ret, 1, 1);
+#else
+			assert(Z_TYPE_P(parser_status->ret) == IS_ARRAY);
+			ZVAL_ZVAL(error_msg, parser_status->ret, 1, 1);
 #endif
-			efree(parser_status->syntax_error);
 		}
 	}
 

parser/scanner.re

@@ -635,6 +635,11 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
 					token->opcode = XX_T_IDENTIFIER;
 					return 0;
 				}
+
+				if (!strcmp(token->value, "_ENV")) {
+					token->opcode = XX_T_IDENTIFIER;
+					return 0;
+				}
 			}
 
 			/* This is hack */

php_zephir_parser.h

@@ -24,7 +24,7 @@ extern zend_module_entry zephir_parser_module_entry;
 #define phpext_zephir_parser_ptr &zephir_parser_module_entry
 
 #define PHP_ZEPHIR_PARSER_NAME "Zephir Parser"
-#define PHP_ZEPHIR_PARSER_VERSION "1.0.2"
+#define PHP_ZEPHIR_PARSER_VERSION "1.0.3"
 #define PHP_ZEPHIR_PARSER_AUTHOR "Zephir Team and contributors"
 #define PHP_ZEPHIR_PARSER_DESCRIPTION "The Zephir Parser delivered as a C extension for the PHP language."
 
@@ -42,7 +42,7 @@ extern zend_module_entry zephir_parser_module_entry;
 
 #define ZEPHIR_PARSER_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(zephir_parser, v)
 
-#if defined(ZTS) && defined(COMPILE_DL_ZEPHIR_PARSER)
+#if defined(ZTS) && defined(COMPILE_DL_ZEPHIR_PARSER) && PHP_VERSION_ID >= 70000
 ZEND_TSRMLS_CACHE_EXTERN();
 #endif
 

unit-tests/Data/globals/simple.zep

@@ -0,0 +1,16 @@
+namespace Example;
+
+class Test
+{
+	public function all()
+	{
+		var _get = _GET;
+		var _post = _POST;
+		var _request = _REQUEST;
+		var _cookie = _COOKIE;
+		var _server = _SERVER;
+		var _session = _SESSION;
+		var _files = _FILES;
+		var _env = _ENV;
+	}
+}