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.

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

#1753 + Conflict Resolution #1904

Merged
merged 3 commits into from
Dec 7, 2020
Merged

#1753 + Conflict Resolution #1904

merged 3 commits into from
Dec 7, 2020

Conversation

WardF
Copy link
Member

@WardF WardF commented Dec 7, 2020

#1753 + Resolves file conflicts.

DennisHeimbigner and others added 3 commits June 5, 2020 17:03
…rt that type.

Built-in type-name keywords are currently flagged when used as
identifiers in formats that do not support that type.  So if a
user declares a dimension named "string" in a classic .cdl file,
it causes an error.

This PR modifies ncgen to allow those format-specific type keywords
to be used as identifiers when compiling to formats that do not
support that type. Also added a test for this.

Also a couple of misc. changes to conditionalize some debug output.
@WardF WardF merged commit b292496 into master Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants