Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@
*.php diff=php
*.[ch] diff=cpp

# Collapse the generated arginfo.h files within a pull request.
# Collapse generated files within a pull request.
**/*_arginfo.h linguist-generated
/Zend/zend_vm_execute.h linguist-generated
/Zend/zend_vm_opcodes.{h,c} linguist-generated
1 change: 1 addition & 0 deletions .github/actions/verify-generated-files/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ runs:
Zend/zend_vm_gen.php
build/gen_stub.php -f
build/gen_stub.php --generate-optimizer-info
ext/tokenizer/tokenizer_data_gen.php
git add . -Nu && git diff --exit-code
2 changes: 1 addition & 1 deletion Zend/zend_vm_gen.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
DATA;

/*
This script creates zend_vm_execute.h and zend_vm_opcodes.h
This script creates zend_vm_execute.h and zend_vm_opcodes.{h,c}
from existing zend_vm_def.h and zend_vm_execute.skl
*/

Expand Down
2 changes: 2 additions & 0 deletions ext/tokenizer/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Collapse generated files within a pull request.
/tokenizer_data.c linguist-generated
6 changes: 3 additions & 3 deletions ext/tokenizer/tokenizer_data_gen.php
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env php
<?php

$rootDir = __DIR__ . '/../..';
$infile = $rootDir . '/Zend/zend_language_parser.y';
$outfile = $rootDir . '/ext/tokenizer/tokenizer_data.c';
$infile = __DIR__ . '/../../Zend/zend_language_parser.y';
$outfile = __DIR__ . '/tokenizer_data.c';

if (!file_exists($infile)) {
fwrite(STDERR, <<<ERROR
Expand Down