Skip to content

Commit ca800dc

Browse files
authored
Merge pull request #75 from davidofferman/development
Updated IDENTIFIER to allow more than 4 underscores. Also additional test code.
2 parents 75a3176 + bdd833a commit ca800dc

File tree

11 files changed

+207
-18502
lines changed

11 files changed

+207
-18502
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ php_test_results_*
4141

4242
# Parser files
4343
/parser/lemon
44+
/parser/parser.c
45+
/parser/scanner.c
4446
/parser/zephir.c
4547
/parser/zephir.h
4648
/parser/zephir.out

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
8+
### Fixed
9+
- Fixed underscore only identifiers to allow more than 4 characters
10+
811
## [1.3.1] - 2019-05-01
912
### Fixed
1013
- Fixed `config.m4` to correct install headers

parser.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ clean: parser-clean tests-clean
1414
.PHONY: parser-clean
1515
parser-clean:
1616
find . -name \*.loT -o -name \*.out | xargs rm -f
17-
find ./parser -name zephir.c -o -name zephir.h | xargs rm -f
17+
find ./parser \
18+
-name zephir.c \
19+
-o -name zephir.h \
20+
-o -name scanner.c \
21+
-o -name parser.c | xargs rm -f
22+
1823

1924
.PHONY: tests-clean
2025
tests-clean:
@@ -41,6 +46,7 @@ $(srcdir)/parser/lemon: $(srcdir)/parser/lemon.c
4146
$(srcdir)/parser/parser.c: $(srcdir)/parser/zephir.c $(srcdir)/parser/base.c
4247
@echo "#include <php.h>" > $@
4348
cat $< >> $@
49+
echo "#line 1 \"parser/base.c\"" >> $@
4450
cat $(top_srcdir)/parser/base.c >> $@
4551
$(SED) s/"#line \([[:digit:]]\+\) \(.*\)\/\(parser\/\)\(.*\)\""/"#line \1 \"\3\4\""/g $@ > $@.tmp && mv -f $@.tmp $@
4652

parser/parser.c

Lines changed: 0 additions & 9489 deletions
This file was deleted.

0 commit comments

Comments
 (0)