Skip to content

Add comma as a valid separator for numeric values #241

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

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Add comma as a valid separator for numeric values #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/ParserVisitor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ParserVisitor(enc: Encoding,
).r
val numericSPicRegexExplicitDot: Regex = ("(S?)"
+ genericLengthRegex('9', optional = true)
+ "\\."
+ "."
+ genericLengthRegex('9')
).r
val numericSPicRegexDecimalScaled: Regex = ("(S?)"
Expand All @@ -86,7 +86,7 @@ class ParserVisitor(enc: Encoding,
).r
val numericZPicRegexExplicitDot: Regex = (genericLengthRegex('Z')
+ genericLengthRegex('9', optional = true)
+ "\\."
+ "."
+ genericLengthRegex('9', optional = true)
+ genericLengthRegex('Z', optional = true)
).r
Expand Down
4 changes: 2 additions & 2 deletions cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/parser/antlr/copybookLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ V_NS: V+ '9'*;


// numbers
PRECISION_9_EXPLICIT_DOT: S? LENGTH_TYPE_9? DOT LENGTH_TYPE_9;
PRECISION_9_EXPLICIT_DOT: S? LENGTH_TYPE_9? (DOT | COMMACHAR) LENGTH_TYPE_9;
PRECISION_9_DECIMAL_SCALED: S? LENGTH_TYPE_9? V ((LENGTH_TYPE_P LENGTH_TYPE_9)? | LENGTH_TYPE_9?);
PRECISION_9_SCALED: S? LENGTH_TYPE_9 LENGTH_TYPE_P?;
PRECISION_9_SCALED_LEAD: S? LENGTH_TYPE_P LENGTH_TYPE_9;
PRECISION_Z_EXPLICIT_DOT: LENGTH_TYPE_Z LENGTH_TYPE_9? DOT ((LENGTH_TYPE_9 LENGTH_TYPE_Z?) | LENGTH_TYPE_Z);
PRECISION_Z_EXPLICIT_DOT: LENGTH_TYPE_Z LENGTH_TYPE_9? (DOT | COMMACHAR) ((LENGTH_TYPE_9 LENGTH_TYPE_Z?) | LENGTH_TYPE_Z);
PRECISION_Z_DECIMAL_SCALED: LENGTH_TYPE_Z LENGTH_TYPE_9? V ((LENGTH_TYPE_P (LENGTH_TYPE_9 | LENGTH_TYPE_Z))? | (LENGTH_TYPE_9? LENGTH_TYPE_Z?));
PRECISION_Z_SCALED: LENGTH_TYPE_Z LENGTH_TYPE_9? LENGTH_TYPE_P?;

Expand Down
Loading