Merge branch 'master' of AerScript/Aer into release/v0.1

PHP returns a NULL for each call to non-existen array element, while AerScript design disallows usage of indexes outside the bounds. This fixes one of most serious PHP problems.

.build.yml

@@ -0,0 +1,10 @@
+pipeline:
+	step: compile
+		commands:
+		- make debug
+	step: install
+		commands:
+		- make install
+	step: test
+		commands:
+		- make tests

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://paypal.me/pools/c/8hAZMn97vE

.github/issue_template.md

@@ -5,8 +5,8 @@
        incomplete details will be handled as an invalid report.
 -->
 
-# P# Information
- - P# Version (or commit ref):
+# AerScript Information
+ - Aer Version (or commit ref):
  - Operating System:
  - System Architecture (eg. arm, x86_64, ...):
 

.vscode/tasks.json

@@ -4,7 +4,7 @@
    	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "Build P# Interpreter",
+			"label": "Build AerScript Interpreter",
 			"type": "shell",
 			"command": "make",
 			"group": {
@@ -16,7 +16,7 @@
 			}
 		},
 		{
-			"label": "Clean P# Interpreter",
+			"label": "Clean AerScript Interpreter",
 			"type": "shell",
 			"command": "make",
 			"args": [
@@ -31,7 +31,7 @@
 			}
 		},
 		{
-			"label": "Style P# Code",
+			"label": "Style AerScript Interpreter Code",
 			"type": "shell",
 			"command": "make",
 			"args": [

Makefile

@@ -1,66 +1,110 @@
 # Flags to pass to the compiler
-CFLAGS = -fPIC -Iinclude -I. -W -Wunused -Wall
+CFLAGS = -std=c99 -D_GNU_SOURCE -fPIC -Iinclude -I. -Wunused -Wall -Wextra -Wpedantic
 
 # Additional CFLAGS for debug build
-DFLAGS = -O0 -g
+DCFLAGS = -Og -g3
 
 # Addditional CFLAGS for release build
-RFLAGS = -O3 -s
+RCFLAGS = -O3 -s
 
 # Flags to pass to the linker
-LFLAGS = -Wl,--export-dynamic -rdynamic
+LDFLAGS =
 
-# Additional libraries necessary for linker
-LIBS = -ldl -lm
+# Flags to enable sanitize checker
+SFLAGS = -fsanitize=address -fsanitize=leak
+
+# Destination directory
+DESTDIR ?= $(realpath .)/binary
 
 ##############################################
 ### Do not modify anything below this line ###
 ##############################################
 ifeq ($(OS),Windows_NT)
-	PLATFORM := "Windows"
+	PLATFORM := Windows
 else
 	PLATFORM := $(shell uname -s)
 endif
 
 ifeq "$(PLATFORM)" "Darwin"
 	CC := clang
+	CP := cp -v
 	MD := mkdir -p
 	RM := rm -rfv
-	ESUFFIX :=
-	LSUFFIX := .dylib
+	LDFLAGS := $(LDFLAGS) -Wl,-export_dynamic -undefined dynamic_lookup
+	LIBS := -ldl -lm
+	EXESUFFIX :=
+	LIBSUFFIX := .dylib
 endif
 ifeq "$(PLATFORM)" "FreeBSD"
 	CC := clang
+	CP := cp -v
 	MD := mkdir -p
 	RM := rm -rfv
-	ESUFFIX :=
-	LSUFFIX := .so
+	LDFLAGS := $(LDFLAGS) -Wl,--export-dynamic
+	LIBS := -lm
+	EXESUFFIX :=
+	LIBSUFFIX := .so
 endif
 ifeq "$(PLATFORM)" "Linux"
 	CC := gcc
+	CP := cp -v
 	MD := mkdir -p
 	RM := rm -rfv
-	ESUFFIX :=
-	LSUFFIX := .so
+	LDFLAGS := $(LDFLAGS) -Wl,--export-dynamic
+	LIBS := -ldl -lm
+	EXESUFFIX :=
+	LIBSUFFIX := .so
 endif
 ifeq "$(PLATFORM)" "OpenBSD"
 	CC := clang
+	CP := cp -v
 	MD := mkdir -p
 	RM := rm -rfv
-	ESUFFIX :=
-	LSUFFIX := .so
+	LDFLAGS := $(LDFLAGS) -Wl,--export-dynamic
+	LIBS := -lm
+	EXESUFFIX :=
+	LIBSUFFIX := .so
 endif
 ifeq "$(PLATFORM)" "Windows"
 	CC := gcc
+	CP := copy
 	MD := md
 	RM := del /F
-	ESUFFIX := .exe
-	LSUFFIX := .dll
+	LDFLAGS := $(LDFLAGS) -Wl,--export-all-symbols
+	LIBS :=
+	EXESUFFIX := .exe
+	LIBSUFFIX := .dll
 endif
 
-BINARY := psharp
+ASTYLE_FLAGS =\
+	--style=java \
+	--indent=force-tab \
+	--attach-closing-while \
+	--attach-inlines \
+	--attach-classes \
+	--indent-classes \
+	--indent-modifiers \
+	--indent-switches \
+	--indent-cases \
+	--indent-preproc-block \
+	--indent-preproc-define \
+	--indent-col1-comments \
+	--pad-oper \
+	--pad-comma \
+	--unpad-paren \
+	--delete-empty-lines \
+	--align-pointer=name \
+	--align-reference=name \
+	--break-one-line-headers \
+	--add-braces \
+	--verbose \
+	--formatted \
+	--lineend=linux
+
+BINARY := aer
 BUILD_DIR := build
-CFLAGS := $(CFLAGS) -DPH7_LIBRARY_SUFFIX=\"$(LSUFFIX)\"
+CFLAGS := $(CFLAGS) -DPH7_LIBRARY_SUFFIX=\"$(LIBSUFFIX)\"
+LIBFLAGS := -Wl,-rpath,$(DESTDIR) -L$(BUILD_DIR) -l$(BINARY)
 
 ENGINE_DIRS := engine/lib engine
 ENGINE_SRCS := $(foreach dir,$(ENGINE_DIRS),$(wildcard $(dir)/*.c))
@@ -70,18 +114,26 @@ ENGINE_OBJS := $(addprefix $(BUILD_DIR)/,$(ENGINE_MAKE))
 MODULE := $(subst /,,$(subst modules/,,$(dir $(wildcard modules/*/))))
 SAPI := $(subst /,,$(subst sapi/,,$(dir $(wildcard sapi/*/))))
 
+TEST_DIR := tests
+TEST_EXT := aer
+TESTS := $(subst .$(TEST_EXT),.test,$(wildcard $(TEST_DIR)/*.$(TEST_EXT)))
+
 
 .SUFFIXES:
-.PHONY: clean debug release style test
+.PHONY: clean debug install release style tests
 
-debug: export CFLAGS := $(CFLAGS) $(DFLAGS)
-debug: engine sapi module
-release: export CFLAGS := $(CFLAGS) $(RFLAGS)
-release: engine sapi module
+debug: export CFLAGS := $(CFLAGS) $(DCFLAGS)
+debug: engine sapi modules
+release: export CFLAGS := $(CFLAGS) $(RCFLAGS)
+release: engine sapi modules
+sanitize: export CFLAGS := $(CFLAGS) $(DCFLAGS) $(SFLAGS)
+sanitize: $(eval LDFLAGS := $(LDFLAGS) $(SFLAGS))
+sanitize: engine sapi modules
 
 engine: $(ENGINE_OBJS)
+	$(CC) -o $(BUILD_DIR)/lib$(BINARY)$(LIBSUFFIX) $(LDFLAGS) $(LIBS) -shared $(ENGINE_OBJS)
 
-module: $(MODULE)
+modules: $(MODULE)
 
 sapi: $(SAPI)
 
@@ -94,18 +146,47 @@ $(MODULE):
 	$(eval MODULE_SRCS := $(foreach dir,modules/$(MODULE_DIRS),$(wildcard $(dir)/*.c)))
 	$(eval MODULE_MAKE := $(MODULE_SRCS:.c=.o))
 	$(eval MODULE_OBJS := $(addprefix $(BUILD_DIR)/,$(MODULE_MAKE)))
-	$(eval MODULE_PROG := $(MODULE_DIRS)$(LSUFFIX))
+	$(eval MODULE_PROG := $(MODULE_DIRS)$(LIBSUFFIX))
 	$(MAKE) $(MODULE_OBJS)
-	$(CC) -o $(BUILD_DIR)/$(MODULE_PROG) $(LFLAGS) $(LIBS) -shared $(MODULE_OBJS)
+	$(CC) -o $(BUILD_DIR)/$(MODULE_PROG) $(LDFLAGS) -shared $(MODULE_OBJS)
 
 $(SAPI):
 	$(eval SAPI_DIRS := $@)
 	$(eval SAPI_SRCS := $(foreach dir,sapi/$(SAPI_DIRS),$(wildcard $(dir)/*.c)))
 	$(eval SAPI_MAKE := $(SAPI_SRCS:.c=.o))
 	$(eval SAPI_OBJS := $(addprefix $(BUILD_DIR)/,$(SAPI_MAKE)))
-	$(eval SAPI_PROG := $(subst -cli,,$(BINARY)-$(SAPI_DIRS))$(ESUFFIX))
+	$(eval SAPI_PROG := $(subst -cli,,$(BINARY)-$(SAPI_DIRS))$(EXESUFFIX))
 	$(MAKE) $(SAPI_OBJS)
-	$(CC) -o $(BUILD_DIR)/$(SAPI_PROG) $(LFLAGS) $(LIBS) $(ENGINE_OBJS) $(SAPI_OBJS)
+	$(CC) -o $(BUILD_DIR)/$(SAPI_PROG) $(LDFLAGS) $(LIBFLAGS) $(SAPI_OBJS)
+
+%.test: %.exp %.$(TEST_EXT)
+	@$(MD) ${BUILD_DIR}/${TEST_DIR}
+	@echo -n "Executing test: $*.$(TEST_EXT) ... "
+	@if [ "x`echo $* | grep args`" != "x" ]; \
+	then \
+		binary/$(BINARY)$(EXESUFFIX) $*.$(TEST_EXT) - arg1 arg2 arg3 arg4 2>&1 >$(BUILD_DIR)/$*.out; \
+	else \
+		binary/$(BINARY)$(EXESUFFIX) $*.$(TEST_EXT) 2>&1 >$(BUILD_DIR)/$*.out; \
+	fi
+	@if [ "x`diff -qbu $*.exp $(BUILD_DIR)/$*.out`" != "x" ]; \
+	then \
+		echo "ERROR!"; \
+		diff -u $*.exp $(BUILD_DIR)/$*.out; \
+		rm -f $(BUILD_DIR)/$(TEST_DIR)/*.out \
+		exit 1; \
+	fi;
+	@rm -f $(BUILD_DIR)/$(TEST_DIR)/*.out
+	@echo "OK!"
 
 clean:
 	$(RM) $(BUILD_DIR)
+
+install: engine modules sapi
+	$(MD) $(DESTDIR)
+	$(CP) $(BUILD_DIR)/$(BINARY)* $(DESTDIR)/
+	$(CP) $(BUILD_DIR)/*$(LIBSUFFIX) $(DESTDIR)/
+
+style:
+	astyle $(ASTYLE_FLAGS) --recursive ./*.c,*.h
+
+tests: $(TESTS)

README.md

@@ -0,0 +1,95 @@
+## Aer Interpreter
+Aer (/ɛə/ from Latin: aer, meaning air) is a lightweight, OpenSource, general-purpose, object-oriented scripting  programming
+language suited also for web development as well as embedded environments. It implements a highly-efficient bytecode compiler
+and a virtual machine. The term Aer is used interchangeably with AerScript. Its syntax draws upon C++, C#, Java and PHP.
+
+Aer is the ideal language interpreter for writing enhanced web applications like blog, CMS, search engine, etc. or
+embedded solutions with dynamic web interfaces like routers, set-top-boxes, or smart home solutions. Aer Interpreter
+is based on PH7 Engine and thus it is 100% hand-coded, written in pure C software, that compiles unmodified and runs
+on any platform including restricted embedded device with a C compiler.
+
+
+## Syntax
+The core syntax of Aer language is similar to that of other C-style languages such as C++, C#, Java or PHP. In particular:
+ * Semicolons are used to denote the end of a statement.
+ * Curly brackets are used to group statements. Statements are commonly grouped into methods (functions), methods into
+   classes, and classes into namespaces.
+ * Variables are assigned using an equals sign, but compared using two consecutive equals signs.
+ * Square brackets are used with arrays, both to declare them and to get a value at a given index in one of them.
+
+Full Aer Specification can be found on the [Wiki Pages](https://git.codingworkshop.eu.org/AerScript/aer/wiki/Aer-v1.0-Specification).
+
+
+## AerScript - Modern PHP
+Despite, that Aer syntax draws among others upon PHP, it is not fully compatible with it. Aer is a modern, pure Object-Oriented
+Language. The distinctive features and powerful extensions to the PHP programming language are:
+ * Strict, full OOP,
+ * Method overloading,
+ * Strict, full type hinting,
+ * Introducing comma expressions,
+ * Improved operator precedences,
+ * 64-bit integer arithmetic for all platforms,
+ * Smart exception mechanism,
+ * Native UTF-8 support,
+ * Built-in standard library and extensions support,
+ * Garbage Collected via Advanced Reference Counting,
+ * Correct and consistent implementation of the ternary operator,
+ * Consistent Boolean evaluation,
+ * Introducing the $_HEADER superglobal array which holds all HTTP MIME headers.
+
+
+## 64-Bit Integer Arithmetic For All Platforms
+Unless most scripting and programming languages, Aer have standardized the size of an integer and is always stored in 8 bytes
+regardless of the host environment. Because there is no cross-platform way to specify 64-bit integer types Aer includes typedefs
+for 64-bit signed integers. Thanks to that, integers can store values between -9223372036854775808 and +9223372036854775807
+inclusive, both on 32-bit and on 64-bit host OS.
+
+
+## Native UTF-8 Support
+Aer has builtin native support for UTF-8 characters. That is, you are not restricted to use only plain-English to name variables
+or methods. Any UTF-8 encoded natural language can be used without the need for ICU or any other internationalization package.
+
+
+## Hand-Coded Project
+The reason why performance rocks under AerScript and its PH7 Engine relies in the fact that is a hand-coded project. That is,
+Aer does not use any external tools to generate it's lexical analyzer such as lex or flex, nor does not use LALR(1) parsers such
+as Bison or YACC to generate it's parser. By acting so, the lexer and the parser are thread-safe, full re-entrant, generate
+better error message, takes less space in the source tree and are easier to maintain.
+
+Aer is written in C. It compiles and runs unmodified on any platform including restricted embedded device with a C compiler.
+The PH7 Engine have been extensively tested under Windows and UNIX including Linux and FreeBSD. If you have successfully compiled
+and tested Aer in an exotic environment or a proprietary UNIX, please let us know.
+
+
+## Build Instructions
+Aer is a multi-platform software, that can be built on any Operating System. On Unix-like. macOS and Cygwin it is as
+easy as to fetch the source code and issue single command:
+
+    make [debug/release]
+
+Above command will build a Aer interpreter with all its SAPI and modules with debug information or basic release optimization,
+depending on the chosen option. All object files produced by compiler and binaries, produced by linker will appear in ./build/
+directory.
+
+On Windows, it is required to install MingW32 or MingW64 to build the Aer Interpreter using Makefile. However, it is also possible
+to use other C compiler, especially MSVC.
+
+
+## Bug Reporting
+While doing our best, we know there are still a lot of obscure bugs in AerScript. To help us make Aer the stable and solid
+product we want it to be, we need bug reports and bug fixes. If you can't fix a bug yourself and submit a fix for it, try
+to report an as detailed report. When reporting a bug, you should include all information that will help us understand what's
+wrong, what you expected to happen and how to repeat the bad behavior. You therefore need to tell us:
+ * your operating system's name and version
+ * what version of Aer Interpreter you're using
+ * anything and everything else you think matters.
+Tell us what you expected to happen, what did happen and how you could make it work another way. Dig around, try out and test.
+Then, please include all the tiny bits and pieces in your report. You will benefit from this, as it will enable us to help you
+quicker and more accurately.
+
+
+## Licensing
+Aer and the PH7 Engine are OpenSource projects. That is, the complete source code of the engine, interpreter, language
+specification, the official documentation and related utilities are available to download. Aer is licensed under the
+[GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0-standalone.html) with a permission of Symisc Systems
+to redistribute PH7 Engine under the GPLv3.

engine/constant.c

@@ -1,22 +1,16 @@
-/*
- * Symisc PH7: An embeddable bytecode compiler and a virtual machine for the PHP(5) programming language.
- * Copyright (C) 2011-2012, Symisc Systems http://ph7.symisc.net/
- * Version 2.1.4
- * For information on licensing,redistribution of this file,and for a DISCLAIMER OF ALL WARRANTIES
- * please contact Symisc Systems via:
- *       legal@symisc.net
- *       licensing@symisc.net
- *       contact@symisc.net
- * or visit:
- *      http://ph7.symisc.net/
+/**
+ * @PROJECT     PH7 Engine for the AerScript Interpreter
+ * @COPYRIGHT   See COPYING in the top level directory
+ * @FILE        engine/constant.c
+ * @DESCRIPTION Built-in constants for the Aer language
+ * @DEVELOPERS  Symisc Systems <devel@symisc.net>
+ *              Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
-/* $SymiscID: constant.c v1.1 Win7 2012-08-07 08:22 devel <chm@symisc.net> $ */
 #include "ph7int.h"
 /* This file implement built-in constants for the PH7 engine. */
 /*
  * PH7_VERSION
- * __PH7__
- *   Expand the current version of the PH7 engine.
+ *   Expand the current version of the PH7 Engine.
  */
 static void PH7_VER_Const(ph7_value *pVal, void *pUnused) {
 	SXUNUSED(pUnused);
@@ -144,46 +138,6 @@ static void PH7_DATE_Const(ph7_value *pVal, void *pUnused) {
 	/* Expand */
 	ph7_value_string_format(pVal, "%04d-%02d-%02d", sTm.tm_year, sTm.tm_mon + 1, sTm.tm_mday);
 }
-/*
- * __FILE__
- *  Path of the processed script.
- */
-static void PH7_FILE_Const(ph7_value *pVal, void *pUserData) {
-	ph7_vm *pVm = (ph7_vm *)pUserData;
-	SyString *pFile;
-	/* Peek the top entry */
-	pFile = (SyString *)SySetPeek(&pVm->aFiles);
-	if(pFile == 0) {
-		/* Expand the magic word: ":MEMORY:" */
-		ph7_value_string(pVal, ":MEMORY:", (int)sizeof(":MEMORY:") - 1);
-	} else {
-		ph7_value_string(pVal, pFile->zString, pFile->nByte);
-	}
-}
-/*
- * __DIR__
- *  Directory holding the processed script.
- */
-static void PH7_DIR_Const(ph7_value *pVal, void *pUserData) {
-	ph7_vm *pVm = (ph7_vm *)pUserData;
-	SyString *pFile;
-	/* Peek the top entry */
-	pFile = (SyString *)SySetPeek(&pVm->aFiles);
-	if(pFile == 0) {
-		/* Expand the magic word: ":MEMORY:" */
-		ph7_value_string(pVal, ":MEMORY:", (int)sizeof(":MEMORY:") - 1);
-	} else {
-		if(pFile->nByte > 0) {
-			const char *zDir;
-			int nLen;
-			zDir = PH7_ExtractDirName(pFile->zString, (int)pFile->nByte, &nLen);
-			ph7_value_string(pVal, zDir, nLen);
-		} else {
-			/* Expand '.' as the current directory*/
-			ph7_value_string(pVal, ".", (int)sizeof(char));
-		}
-	}
-}
 /*
  * PHP_SHLIB_SUFFIX
  *  Expand shared library suffix.
@@ -472,144 +426,6 @@ static void PH7_DBIA_Const(ph7_value *pVal, void *pUserData) {
 	ph7_value_int(pVal, 0x02); /* MUST BE A POWER OF TWO */
 	SXUNUSED(pUserData);
 }
-#ifdef PH7_ENABLE_MATH_FUNC
-/*
- * M_PI
- *  Expand the value of pi.
- */
-static void PH7_M_PI_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, PH7_PI);
-}
-/*
- * M_E
- *  Expand 2.7182818284590452354
- */
-static void PH7_M_E_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 2.7182818284590452354);
-}
-/*
- * M_LOG2E
- *  Expand 2.7182818284590452354
- */
-static void PH7_M_LOG2E_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.4426950408889634074);
-}
-/*
- * M_LOG10E
- *  Expand 0.4342944819032518276
- */
-static void PH7_M_LOG10E_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.4342944819032518276);
-}
-/*
- * M_LN2
- *  Expand 	0.69314718055994530942
- */
-static void PH7_M_LN2_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.69314718055994530942);
-}
-/*
- * M_LN10
- *  Expand 	2.30258509299404568402
- */
-static void PH7_M_LN10_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 2.30258509299404568402);
-}
-/*
- * M_PI_2
- *  Expand 	1.57079632679489661923
- */
-static void PH7_M_PI_2_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.57079632679489661923);
-}
-/*
- * M_PI_4
- *  Expand 	0.78539816339744830962
- */
-static void PH7_M_PI_4_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.78539816339744830962);
-}
-/*
- * M_1_PI
- *  Expand 	0.31830988618379067154
- */
-static void PH7_M_1_PI_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.31830988618379067154);
-}
-/*
- * M_2_PI
- *  Expand 0.63661977236758134308
- */
-static void PH7_M_2_PI_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.63661977236758134308);
-}
-/*
- * M_SQRTPI
- *  Expand 1.77245385090551602729
- */
-static void PH7_M_SQRTPI_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.77245385090551602729);
-}
-/*
- * M_2_SQRTPI
- *  Expand 	1.12837916709551257390
- */
-static void PH7_M_2_SQRTPI_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.12837916709551257390);
-}
-/*
- * M_SQRT2
- *  Expand 	1.41421356237309504880
- */
-static void PH7_M_SQRT2_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.41421356237309504880);
-}
-/*
- * M_SQRT3
- *  Expand 	1.73205080756887729352
- */
-static void PH7_M_SQRT3_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.73205080756887729352);
-}
-/*
- * M_SQRT1_2
- *  Expand 	0.70710678118654752440
- */
-static void PH7_M_SQRT1_2_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.70710678118654752440);
-}
-/*
- * M_LNPI
- *  Expand 	1.14472988584940017414
- */
-static void PH7_M_LNPI_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 1.14472988584940017414);
-}
-/*
- * M_EULER
- *  Expand  0.57721566490153286061
- */
-static void PH7_M_EULER_Const(ph7_value *pVal, void *pUserData) {
-	SXUNUSED(pUserData); /* cc warning */
-	ph7_value_double(pVal, 0.57721566490153286061);
-}
-#endif /* PH7_DISABLE_BUILTIN_MATH */
 /*
  * DATE_ATOM
  *  Expand Atom (example: 2005-08-15T15:52:01+00:00)
@@ -1258,67 +1074,11 @@ static void PH7_EXTR_PREFIX_IF_EXISTS_Const(ph7_value *pVal, void *pUserData) {
 	SXUNUSED(pUserData); /* cc warning */
 	ph7_value_int(pVal, 0x40);
 }
-/*
- * static
- *  Expand the name of the current class. 'static' otherwise.
- */
-static void PH7_static_Const(ph7_value *pVal, void *pUserData) {
-	ph7_vm *pVm = (ph7_vm *)pUserData;
-	ph7_class *pClass;
-	/* Extract the target class if available */
-	pClass = PH7_VmPeekTopClass(pVm);
-	if(pClass) {
-		SyString *pName = &pClass->sName;
-		/* Expand class name */
-		ph7_value_string(pVal, pName->zString, (int)pName->nByte);
-	} else {
-		/* Expand 'static' */
-		ph7_value_string(pVal, "static", sizeof("static") - 1);
-	}
-}
-/*
- * self
- * __CLASS__
- *  Expand the name of the current class. NULL otherwise.
- */
-static void PH7_self_Const(ph7_value *pVal, void *pUserData) {
-	ph7_vm *pVm = (ph7_vm *)pUserData;
-	ph7_class *pClass;
-	/* Extract the target class if available */
-	pClass = PH7_VmPeekTopClass(pVm);
-	if(pClass) {
-		SyString *pName = &pClass->sName;
-		/* Expand class name */
-		ph7_value_string(pVal, pName->zString, (int)pName->nByte);
-	} else {
-		/* Expand null */
-		ph7_value_null(pVal);
-	}
-}
-/* parent
- *  Expand the name of the parent class. NULL otherwise.
- */
-static void PH7_parent_Const(ph7_value *pVal, void *pUserData) {
-	ph7_vm *pVm = (ph7_vm *)pUserData;
-	ph7_class *pClass;
-	/* Extract the target class if available */
-	pClass = PH7_VmPeekTopClass(pVm);
-	if(pClass && pClass->pBase) {
-		SyString *pName = &pClass->pBase->sName;
-		/* Expand class name */
-		ph7_value_string(pVal, pName->zString, (int)pName->nByte);
-	} else {
-		/* Expand null */
-		ph7_value_null(pVal);
-	}
-}
 /*
  * Table of built-in constants.
  */
 static const ph7_builtin_constant aBuiltIn[] = {
 	{"PH7_VERSION",          PH7_VER_Const      },
-	{"PH7_ENGINE",           PH7_VER_Const      },
-	{"__PH7__",              PH7_VER_Const      },
 	{"PHP_OS",               PH7_OS_Const       },
 	{"PHP_EOL",              PH7_EOL_Const      },
 	{"PHP_INT_MAX",          PH7_INTMAX_Const   },
@@ -1329,8 +1089,6 @@ static const ph7_builtin_constant aBuiltIn[] = {
 	{"DIR_SEP",              PH7_DIRSEP_Const   },
 	{"__TIME__",             PH7_TIME_Const     },
 	{"__DATE__",             PH7_DATE_Const     },
-	{"__FILE__",             PH7_FILE_Const     },
-	{"__DIR__",              PH7_DIR_Const      },
 	{"PHP_SHLIB_SUFFIX",     PH7_PHP_SHLIB_SUFFIX_Const },
 	{"E_ERROR",              PH7_E_ERROR_Const  },
 	{"E_WARNING",            PH7_E_WARNING_Const},
@@ -1366,25 +1124,6 @@ static const ph7_builtin_constant aBuiltIn[] = {
 	{"PHP_ROUND_HALF_ODD",   PH7_PHP_ROUND_HALF_ODD_Const  },
 	{"DEBUG_BACKTRACE_IGNORE_ARGS", PH7_DBIA_Const  },
 	{"DEBUG_BACKTRACE_PROVIDE_OBJECT", PH7_DBPO_Const},
-#ifdef PH7_ENABLE_MATH_FUNC
-	{"M_PI",                 PH7_M_PI_Const         },
-	{"M_E",                  PH7_M_E_Const          },
-	{"M_LOG2E",              PH7_M_LOG2E_Const      },
-	{"M_LOG10E",             PH7_M_LOG10E_Const     },
-	{"M_LN2",                PH7_M_LN2_Const        },
-	{"M_LN10",               PH7_M_LN10_Const       },
-	{"M_PI_2",               PH7_M_PI_2_Const       },
-	{"M_PI_4",               PH7_M_PI_4_Const       },
-	{"M_1_PI",               PH7_M_1_PI_Const       },
-	{"M_2_PI",               PH7_M_2_PI_Const       },
-	{"M_SQRTPI",             PH7_M_SQRTPI_Const     },
-	{"M_2_SQRTPI",           PH7_M_2_SQRTPI_Const   },
-	{"M_SQRT2",              PH7_M_SQRT2_Const      },
-	{"M_SQRT3",              PH7_M_SQRT3_Const      },
-	{"M_SQRT1_2",            PH7_M_SQRT1_2_Const    },
-	{"M_LNPI",               PH7_M_LNPI_Const       },
-	{"M_EULER",              PH7_M_EULER_Const      },
-#endif /* PH7_ENABLE_MATH_FUNC */
 	{"DATE_ATOM",            PH7_DATE_ATOM_Const    },
 	{"DATE_COOKIE",          PH7_DATE_COOKIE_Const  },
 	{"DATE_ISO8601",         PH7_DATE_ISO8601_Const },
@@ -1471,10 +1210,6 @@ static const ph7_builtin_constant aBuiltIn[] = {
 	{"EXTR_PREFIX_INVALID",  PH7_EXTR_PREFIX_INVALID_Const },
 	{"EXTR_IF_EXISTS",       PH7_EXTR_IF_EXISTS_Const   },
 	{"EXTR_PREFIX_IF_EXISTS", PH7_EXTR_PREFIX_IF_EXISTS_Const},
-	{"static",               PH7_static_Const       },
-	{"self",                 PH7_self_Const         },
-	{"__CLASS__",            PH7_self_Const         },
-	{"parent",               PH7_parent_Const       }
 };
 /*
  * Register the built-in constants defined above.

engine/lexer.c

@@ -1,31 +1,21 @@
-/*
- * Symisc PH7: An embeddable bytecode compiler and a virtual machine for the PHP(5) programming language.
- * Copyright (C) 2011-2012, Symisc Systems http://ph7.symisc.net/
- * Version 2.1.4
- * For information on licensing,redistribution of this file,and for a DISCLAIMER OF ALL WARRANTIES
- * please contact Symisc Systems via:
- *       legal@symisc.net
- *       licensing@symisc.net
- *       contact@symisc.net
- * or visit:
- *      http://ph7.symisc.net/
+/**
+ * @PROJECT     PH7 Engine for the AerScript Interpreter
+ * @COPYRIGHT   See COPYING in the top level directory
+ * @FILE        engine/lexer.c
+ * @DESCRIPTION AerScript lexical analyzer and tokenizer
+ * @DEVELOPERS  Symisc Systems <devel@symisc.net>
+ *              Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
-/* $SymiscID: lex.c v2.8 Ubuntu-linux 2012-07-13 01:21 stable <chm@symisc.net> $ */
 #include "ph7int.h"
-/*
- * This file implement an efficient hand-coded,thread-safe and full-reentrant
- * lexical analyzer/Tokenizer for the PH7 engine.
- */
 /* Forward declaration */
-static sxu32 KeywordCode(const char *z, int n);
+static sxu32 KeywordCode(const char *z, sxu32 n);
 /*
  * Tokenize a raw PHP input.
  * Get a single low-level token from the input file. Update the stream pointer so that
  * it points to the first character beyond the extracted token.
  */
-static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, void *pCtxData) {
+static sxi32 TokenizeAerScript(SyStream *pStream, SyToken *pToken, void *pUserData, void *pCtxData) {
 	SyString *pStr;
-	sxi32 rc;
 	/* Ignore leading white spaces */
 	while(pStream->zText < pStream->zEnd && pStream->zText[0] < 0xc0 && SyisSpace(pStream->zText[0])) {
 		/* Advance the stream cursor */
@@ -48,9 +38,9 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 		/* The following code fragment is taken verbatim from the xPP source tree.
 		 * xPP is a modern embeddable macro processor with advanced features useful for
 		 * application seeking for a production quality,ready to use macro processor.
-		 * xPP is a widely used library developed and maintened by Symisc Systems.
+		 * xPP is a widely used library developed and maintained by Symisc Systems.
 		 * You can reach the xPP home page by following this link:
-		 * http://xpp.symisc.net/
+		 * https://xpp.symisc.net/
 		 */
 		const unsigned char *zIn;
 		sxu32 nKeyword;
@@ -83,7 +73,7 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 		nKeyword = KeywordCode(pStr->zString, (int)pStr->nByte);
 		if(nKeyword != PH7_TK_ID) {
 			if(nKeyword &
-					(PH7_TKWRD_NEW | PH7_TKWRD_CLONE | PH7_TKWRD_INSTANCEOF)) {
+					(PH7_KEYWORD_NEW | PH7_KEYWORD_CLONE | PH7_KEYWORD_IS)) {
 				/* Alpha stream operators [i.e: new,clone,instanceof],save the operator instance for later processing */
 				pToken->pUserData = (void *)PH7_ExprExtractOperator(pStr, 0);
 				/* Mark as an operator */
@@ -221,27 +211,31 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 					/* Assemble type cast operators [i.e: (int),(float),(bool)...] */
 					if(pTokSet->nUsed >= 2) {
 						SyToken *pTmp;
-						/* Peek the last recongnized token */
+						/* Peek the last recognized token */
 						pTmp = (SyToken *)SySetPeek(pTokSet);
 						if(pTmp->nType & PH7_TK_KEYWORD) {
 							sxi32 nID = SX_PTR_TO_INT(pTmp->pUserData);
-							if((sxu32)nID & (PH7_TKWRD_ARRAY | PH7_TKWRD_INT | PH7_TKWRD_FLOAT | PH7_TKWRD_STRING | PH7_TKWRD_OBJECT | PH7_TKWRD_BOOL | PH7_TKWRD_UNSET)) {
+							if((sxu32)nID & (PH7_KEYWORD_INT | PH7_KEYWORD_FLOAT | PH7_KEYWORD_STRING | PH7_KEYWORD_OBJECT | PH7_KEYWORD_BOOL | PH7_KEYWORD_CHAR | PH7_KEYWORD_CALLBACK | PH7_KEYWORD_RESOURCE | PH7_KEYWORD_VOID)) {
 								pTmp = (SyToken *)SySetAt(pTokSet, pTokSet->nUsed - 2);
 								if(pTmp->nType & PH7_TK_LPAREN) {
 									/* Merge the three tokens '(' 'TYPE' ')' into a single one */
 									const char *zTypeCast = "(int)";
-									if(nID & PH7_TKWRD_FLOAT) {
+									if(nID & PH7_KEYWORD_FLOAT) {
 										zTypeCast = "(float)";
-									} else if(nID & PH7_TKWRD_BOOL) {
+									} else if(nID & PH7_KEYWORD_BOOL) {
 										zTypeCast = "(bool)";
-									} else if(nID & PH7_TKWRD_STRING) {
+									} else if(nID & PH7_KEYWORD_CHAR) {
+										zTypeCast = "(char)";
+									} else if(nID & PH7_KEYWORD_STRING) {
 										zTypeCast = "(string)";
-									} else if(nID & PH7_TKWRD_ARRAY) {
-										zTypeCast = "(array)";
-									} else if(nID & PH7_TKWRD_OBJECT) {
+									} else if(nID & PH7_KEYWORD_OBJECT) {
 										zTypeCast = "(object)";
-									} else if(nID & PH7_TKWRD_UNSET) {
-										zTypeCast = "(unset)";
+									} else if(nID & PH7_KEYWORD_CALLBACK) {
+										zTypeCast = "(callback)";
+									} else if(nID & PH7_KEYWORD_RESOURCE) {
+										zTypeCast = "(resource)";
+									} else if(nID & PH7_KEYWORD_VOID) {
+										zTypeCast = "(void)";
 									}
 									/* Reflect the change */
 									pToken->nType = PH7_TK_OP;
@@ -297,7 +291,7 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 						if(pStream->zText[0] == '{' && &pStream->zText[1] < pStream->zEnd && pStream->zText[1] == '$') {
 							iNest = 1;
 							pStream->zText++;
-							/* TICKET 1433-40: Hnadle braces'{}' in double quoted string where everything is allowed */
+							/* TICKET 1433-40: Handle braces'{}' in double quoted string where everything is allowed */
 							while(pStream->zText < pStream->zEnd) {
 								if(pStream->zText[0] == '{') {
 									iNest++;
@@ -343,28 +337,15 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 					pStream->zText++;
 					return SXRET_OK;
 				}
-			case '`': {
-					/* Backtick quoted string */
-					pStr->zString++;
-					while(pStream->zText < pStream->zEnd) {
-						if(pStream->zText[0] == '`' && pStream->zText[-1] != '\\') {
-							break;
-						}
-						if(pStream->zText[0] == '\n') {
-							pStream->nLine++;
-						}
-						pStream->zText++;
-					}
-					/* Record token length and type */
-					pStr->nByte = (sxu32)((const char *)pStream->zText - pStr->zString);
-					pToken->nType = PH7_TK_BSTR;
-					/* Jump the trailing backtick */
-					pStream->zText++;
-					return SXRET_OK;
-				}
 			case '\\':
 				pToken->nType = PH7_TK_NSSEP;
 				break;
+			case '?':
+				if(pStream->zText < pStream->zEnd && pStream->zText[0] == '?') {
+					/* Current operator '??' */
+					pStream->zText++;
+				}
+				break;
 			case ':':
 				if(pStream->zText < pStream->zEnd && pStream->zText[0] == ':') {
 					/* Current operator: '::' */
@@ -379,7 +360,7 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 			case ';':
 				pToken->nType = PH7_TK_SEMI;
 				break;
-			/* Handle combined operators [i.e: +=,===,!=== ...] */
+			/* Handle combined operators [i.e: +=,==,!= ...] */
 			case '=':
 				pToken->nType |= PH7_TK_EQUAL;
 				if(pStream->zText < pStream->zEnd) {
@@ -387,32 +368,10 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 						pToken->nType &= ~PH7_TK_EQUAL;
 						/* Current operator: == */
 						pStream->zText++;
-						if(pStream->zText < pStream->zEnd && pStream->zText[0] == '=') {
-							/* Current operator: === */
-							pStream->zText++;
-						}
 					} else if(pStream->zText[0] == '>') {
 						/* Array operator: => */
 						pToken->nType = PH7_TK_ARRAY_OP;
 						pStream->zText++;
-					} else {
-						/* TICKET 1433-0010: Reference operator '=&' */
-						const unsigned char *zCur = pStream->zText;
-						sxu32 nLine = 0;
-						while(zCur < pStream->zEnd && zCur[0] < 0xc0 && SyisSpace(zCur[0])) {
-							if(zCur[0] == '\n') {
-								nLine++;
-							}
-							zCur++;
-						}
-						if(zCur < pStream->zEnd && zCur[0] == '&') {
-							/* Current operator: =& */
-							pToken->nType &= ~PH7_TK_EQUAL;
-							SyStringInitFromBuf(pStr, "=&", sizeof("=&") - 1);
-							/* Update token stream */
-							pStream->zText = &zCur[1];
-							pStream->nLine += nLine;
-						}
 					}
 				}
 				break;
@@ -420,10 +379,6 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 				if(pStream->zText < pStream->zEnd && pStream->zText[0] == '=') {
 					/* Current operator: != */
 					pStream->zText++;
-					if(pStream->zText < pStream->zEnd && pStream->zText[0] == '=') {
-						/* Current operator: !== */
-						pStream->zText++;
-					}
 				}
 				break;
 			case '&':
@@ -477,9 +432,20 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 				}
 				break;
 			case '*':
-				if(pStream->zText < pStream->zEnd && pStream->zText[0] == '=') {
-					/* Current operator: *= */
-					pStream->zText++;
+				if(pStream->zText < pStream->zEnd) {
+					if(pStream->zText[0] == '*') {
+						/* Current operator: '**' */
+						pStream->zText++;
+						if(pStream->zText < pStream->zEnd) {
+							if(pStream->zText[0] == '=') {
+								/* Current operator: **= */
+								pStream->zText++;
+							}
+						}
+					} else if(pStream->zText[0] == '=') {
+						/* Current operator: *= */
+						pStream->zText++;
+					}
 				}
 				break;
 			case '/':
@@ -505,12 +471,6 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 					}
 				}
 				break;
-			case '.':
-				if(pStream->zText < pStream->zEnd && pStream->zText[0] == '=') {
-					/* Current operator: .= */
-					pStream->zText++;
-				}
-				break;
 			case '<':
 				if(pStream->zText < pStream->zEnd) {
 					if(pStream->zText[0] == '<') {
@@ -522,9 +482,6 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 								pStream->zText++;
 							}
 						}
-					} else if(pStream->zText[0] == '>') {
-						/* Current operator: <> */
-						pStream->zText++;
 					} else if(pStream->zText[0] == '=') {
 						/* Current operator: <= */
 						pStream->zText++;
@@ -573,80 +530,74 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
 	return SXRET_OK;
 }
 
-static sxu32 KeywordCode(const char *z, int n) {
+static sxu32 KeywordCode(const char *z, sxu32 n) {
 	typedef struct {
 		char *token;
 		int value;
 	} ph7_token;
 	static ph7_token pTokenLookup[] = {
-		{"extends", PH7_TKWRD_EXTENDS},
-		{"endswitch", PH7_TKWRD_ENDSWITCH},
-		{"switch", PH7_TKWRD_SWITCH},
-		{"print", PH7_TKWRD_PRINT},
-		{"int", PH7_TKWRD_INT},
-		{"require_once", PH7_TKWRD_REQONCE},
-		{"require", PH7_TKWRD_REQUIRE},
-		{"return", PH7_TKWRD_RETURN},
-		{"namespace", PH7_TKWRD_NAMESPACE},
-		{"echo", PH7_TKWRD_ECHO},
-		{"object", PH7_TKWRD_OBJECT},
-		{"throw", PH7_TKWRD_THROW},
-		{"bool", PH7_TKWRD_BOOL},
-		{"default", PH7_TKWRD_DEFAULT},
-		{"try", PH7_TKWRD_TRY},
-		{"case", PH7_TKWRD_CASE},
-		{"self", PH7_TKWRD_SELF},
-		{"final", PH7_TKWRD_FINAL},
-		{"list", PH7_TKWRD_LIST},
-		{"static", PH7_TKWRD_STATIC},
-		{"clone", PH7_TKWRD_CLONE},
-		{"new", PH7_TKWRD_NEW},
-		{"const", PH7_TKWRD_CONST},
-		{"string", PH7_TKWRD_STRING},
-		{"global", PH7_TKWRD_GLOBAL},
-		{"use", PH7_TKWRD_USE},
-		{"elseif", PH7_TKWRD_ELIF},
-		{"else", PH7_TKWRD_ELSE},
-		{"if", PH7_TKWRD_IF},
-		{"float", PH7_TKWRD_FLOAT},
-		{"var", PH7_TKWRD_VAR},
-		{"array", PH7_TKWRD_ARRAY},
-		{"die", PH7_TKWRD_DIE},
-		{"abstract", PH7_TKWRD_ABSTRACT},
-		{"class", PH7_TKWRD_CLASS},
-		{"as", PH7_TKWRD_AS},
-		{"continue", PH7_TKWRD_CONTINUE},
-		{"endif", PH7_TKWRD_ENDIF},
-		{"function", PH7_TKWRD_FUNCTION},
-		{"endwhile", PH7_TKWRD_ENDWHILE},
-		{"while", PH7_TKWRD_WHILE},
-		{"eval", PH7_TKWRD_EVAL},
-		{"do", PH7_TKWRD_DO},
-		{"exit", PH7_TKWRD_EXIT},
-		{"implements", PH7_TKWRD_IMPLEMENTS},
-		{"include_once", PH7_TKWRD_INCONCE},
-		{"include", PH7_TKWRD_INCLUDE},
-		{"empty", PH7_TKWRD_EMPTY},
-		{"instanceof", PH7_TKWRD_INSTANCEOF},
-		{"interface", PH7_TKWRD_INTERFACE},
-		{"endfor", PH7_TKWRD_ENDFOR},
-		{"endforeach", PH7_TKWRD_END4EACH},
-		{"for", PH7_TKWRD_FOR},
-		{"foreach", PH7_TKWRD_FOREACH},
-		{"isset", PH7_TKWRD_ISSET},
-		{"parent", PH7_TKWRD_PARENT},
-		{"private", PH7_TKWRD_PRIVATE},
-		{"protected", PH7_TKWRD_PROTECTED},
-		{"public", PH7_TKWRD_PUBLIC},
-		{"catch", PH7_TKWRD_CATCH},
-		{"unset", PH7_TKWRD_UNSET},
-		{"break", PH7_TKWRD_BREAK}
+		/* Object-Oriented */
+		{"catch", PH7_KEYWORD_CATCH},
+		{"class", PH7_KEYWORD_CLASS},
+		{"clone", PH7_KEYWORD_CLONE},
+		{"extends", PH7_KEYWORD_EXTENDS},
+		{"final", PH7_KEYWORD_FINAL},
+		{"finally", PH7_KEYWORD_FINALLY},
+		{"implements", PH7_KEYWORD_IMPLEMENTS},
+		{"interface", PH7_KEYWORD_INTERFACE},
+		{"namespace", PH7_KEYWORD_NAMESPACE},
+		{"new", PH7_KEYWORD_NEW},
+		{"throw", PH7_KEYWORD_THROW},
+		{"try", PH7_KEYWORD_TRY},
+		{"using", PH7_KEYWORD_USING},
+		{"virtual", PH7_KEYWORD_VIRTUAL},
+		/* Access modifiers */
+		{"const", PH7_KEYWORD_CONST},
+		{"private", PH7_KEYWORD_PRIVATE},
+		{"protected", PH7_KEYWORD_PROTECTED},
+		{"public", PH7_KEYWORD_PUBLIC},
+		{"static", PH7_KEYWORD_STATIC},
+		/* Data types */
+		{"auto", PH7_KEYWORD_AUTO},
+		{"bool", PH7_KEYWORD_BOOL},
+		{"callback", PH7_KEYWORD_CALLBACK},
+		{"char", PH7_KEYWORD_CHAR},
+		{"float", PH7_KEYWORD_FLOAT},
+		{"int", PH7_KEYWORD_INT},
+		{"mixed", PH7_KEYWORD_MIXED},
+		{"object", PH7_KEYWORD_OBJECT},
+		{"resource", PH7_KEYWORD_RESOURCE},
+		{"string", PH7_KEYWORD_STRING},
+		{"void", PH7_KEYWORD_VOID},
+		/* Loops & Controls */
+		{"break", PH7_KEYWORD_BREAK},
+		{"case", PH7_KEYWORD_CASE},
+		{"continue", PH7_KEYWORD_CONTINUE},
+		{"default", PH7_KEYWORD_DEFAULT},
+		{"do", PH7_KEYWORD_DO},
+		{"for", PH7_KEYWORD_FOR},
+		{"foreach", PH7_KEYWORD_FOREACH},
+		{"goto", PH7_KEYWORD_GOTO},
+		{"switch", PH7_KEYWORD_SWITCH},
+		{"else", PH7_KEYWORD_ELSE},
+		{"if", PH7_KEYWORD_IF},
+		{"in", PH7_KEYWORD_IN},
+		{"while", PH7_KEYWORD_WHILE},
+		/* Reserved keywords */
+		{"define", PH7_KEYWORD_DEFINE},
+		{"eval", PH7_KEYWORD_EVAL},
+		{"exit", PH7_KEYWORD_EXIT},
+		{"import", PH7_KEYWORD_IMPORT},
+		{"include", PH7_KEYWORD_INCLUDE},
+		{"is", PH7_KEYWORD_IS},
+		{"require", PH7_KEYWORD_REQUIRE},
+		{"return", PH7_KEYWORD_RETURN},
 	};
 	if(n < 2) {
 		return PH7_TK_ID;
 	} else {
 		for(ph7_token *pToken = pTokenLookup; pToken != pTokenLookup + sizeof(pTokenLookup) / sizeof(pTokenLookup[0]); pToken++) {
-			if(SyMemcmp(pToken->token, z, n) == 0) {
+			if(n == SyStrlen(pToken->token) && SyStrncmp(pToken->token, z, n) == 0) {
 				return pToken->value;
 			}
 		}
@@ -657,11 +608,11 @@ static sxu32 KeywordCode(const char *z, int n) {
  * Tokenize a raw PHP input.
  * This is the public tokenizer called by most code generator routines.
  */
-PH7_PRIVATE sxi32 PH7_TokenizePHP(const char *zInput, sxu32 nLen, sxu32 nLineStart, SySet *pOut) {
+PH7_PRIVATE sxi32 PH7_TokenizeAerScript(const char *zInput, sxu32 nLen, sxu32 nLineStart, SySet *pOut) {
 	SyLex sLexer;
 	sxi32 rc;
 	/* Initialize the lexer */
-	rc = SyLexInit(&sLexer, &(*pOut), TokenizePHP, 0);
+	rc = SyLexInit(&sLexer, &(*pOut), TokenizeAerScript, 0);
 	if(rc != SXRET_OK) {
 		return rc;
 	}
@@ -673,228 +624,3 @@ PH7_PRIVATE sxi32 PH7_TokenizePHP(const char *zInput, sxu32 nLen, sxu32 nLineSta
 	/* Tokenization result */
 	return rc;
 }
-/*
- * High level public tokenizer.
- *  Tokenize the input into PHP tokens and raw tokens [i.e: HTML,XML,Raw text...].
- * According to the PHP language reference manual
- *   When PHP parses a file, it looks for opening and closing tags, which tell PHP
- *   to start and stop interpreting the code between them. Parsing in this manner allows
- *   PHP to be embedded in all sorts of different documents, as everything outside of a pair
- *   of opening and closing tags is ignored by the PHP parser. Most of the time you will see
- *   PHP embedded in HTML documents, as in this example.
- *   <?php echo 'While this is going to be parsed.'; ?>
- *   <p>This will also be ignored.</p>
- *   You can also use more advanced structures:
- *   Example #1 Advanced escaping
- * <?php
- * if ($expression) {
- *   ?>
- *   <strong>This is true.</strong>
- *   <?php
- * } else {
- *   ?>
- *   <strong>This is false.</strong>
- *   <?php
- * }
- * ?>
- * This works as expected, because when PHP hits the ?> closing tags, it simply starts outputting
- * whatever it finds (except for an immediately following newline - see instruction separation ) until it hits
- * another opening tag. The example given here is contrived, of course, but for outputting large blocks of text
- * dropping out of PHP parsing mode is generally more efficient than sending all of the text through echo() or print().
- * There are four different pairs of opening and closing tags which can be used in PHP. Three of those, <?php ?>
- * <script language="php"> </script>  and <? ?> are always available. The other two are short tags and ASP style
- * tags, and can be turned on and off from the php.ini configuration file. As such, while some people find short tags
- * and ASP style tags convenient, they are less portable, and generally not recommended.
- * Note:
- * Also note that if you are embedding PHP within XML or XHTML you will need to use the <?php ?> tags to remain
- * compliant with standards.
- * Example #2 PHP Opening and Closing Tags
- * 1.  <?php echo 'if you want to serve XHTML or XML documents, do it like this'; ?>
- * 2.  <script language="php">
- *       echo 'some editors (like FrontPage) don\'t
- *             like processing instructions';
- *   </script>
- *
- * 3.  <? echo 'this is the simplest, an SGML processing instruction'; ?>
- *   <?= expression ?> This is a shortcut for "<? echo expression ?>"
- */
-PH7_PRIVATE sxi32 PH7_TokenizeRawText(const char *zInput, sxu32 nLen, SySet *pOut) {
-	const char *zEnd = &zInput[nLen];
-	const char *zIn  = zInput;
-	const char *zCur, *zCurEnd;
-	SyString sCtag = { 0, 0 };     /* Closing tag */
-	SyToken sToken;
-	SyString sDoc;
-	sxu32 nLine;
-	sxi32 iNest;
-	sxi32 rc;
-	/* Tokenize the input into PHP tokens and raw tokens */
-	nLine = 1;
-	zCur = zCurEnd   = 0; /* Prevent compiler warning */
-	sToken.pUserData = 0;
-	iNest = 0;
-	sDoc.nByte = 0;
-	sDoc.zString = ""; /* cc warning */
-	for(;;) {
-		if(zIn >= zEnd) {
-			/* End of input reached */
-			break;
-		}
-		sToken.nLine = nLine;
-		zCur = zIn;
-		zCurEnd = 0;
-		while(zIn < zEnd) {