Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compatibilityVersion order #104

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Fix compatibilityVersion order #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7090cc7
Allow empty buildStyle
dnicolson Feb 21, 2024
5c63bbd
Add refType
dnicolson Feb 21, 2024
a93c83b
Add test
dnicolson Feb 21, 2024
833725f
Fix order of attributes in PBXProj to fix opencv test
Serchinastico Feb 22, 2024
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
13 changes: 10 additions & 3 deletions kin/grammar/PBXProj.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ pbx_build_file
pbx_build_style
: REFERENCE '=' '{'
isa_pbx_build_style
build_settings
name
build_settings?
name?
'}' ';'
;

Expand Down Expand Up @@ -225,6 +225,7 @@ pbx_file_reference
line_ending?
name?
path?
ref_type?
plist_structure_definition_identifier?
source_tree?
tab_width?
Expand Down Expand Up @@ -306,8 +307,8 @@ pbx_project
attributes?
build_configuration_list
build_settings?
compatibility_version?
build_styles?
compatibility_version?
development_region?
has_scanned_for_encodings
known_regions?
Expand Down Expand Up @@ -720,6 +721,10 @@ plist_structure_definition_identifier
: PLIST_STRUCTURE_DEFINITION_IDENTIFIER '=' str_number_variable ';'
;

ref_type
: REF_TYPE '=' NUMBER ';'
;

attributes
: ATTRIBUTES '=' '{'
build_targets_in_parallel?
Expand Down Expand Up @@ -1044,6 +1049,7 @@ any_token
| LINE_ENDING
| XC_LANGUAGE_SPECIFICATION_IDENTIFIER
| PLIST_STRUCTURE_DEFINITION_IDENTIFIER
| REF_TYPE
| ATTRIBUTES
| LAST_SWIFT_MIGRATION
| DEFAULT_BUILD_SYSTEM_TYPE_FOR_WORKSPACE
Expand Down Expand Up @@ -1177,6 +1183,7 @@ PRODUCT_TYPE : 'productType';
LINE_ENDING : 'lineEnding';
XC_LANGUAGE_SPECIFICATION_IDENTIFIER : 'xcLanguageSpecificationIdentifier';
PLIST_STRUCTURE_DEFINITION_IDENTIFIER : 'plistStructureDefinitionIdentifier';
REF_TYPE : 'refType';
ATTRIBUTES : 'attributes';
LAST_SWIFT_MIGRATION : 'LastSwiftMigration';
DEFAULT_BUILD_SYSTEM_TYPE_FOR_WORKSPACE : 'DefaultBuildSystemTypeForWorkspace';
Expand Down
Loading