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

ci: editorconfig updates #280

Merged
merged 3 commits into from
Jul 5, 2024
Merged

ci: editorconfig updates #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3223004
ci: pin editorconfig-checker version
vbarua Jul 3, 2024
fd27c75
ci: enforce tabs for .gitmodule and *.g4 files
vbarua Jul 5, 2024
b4dd2e3
style: use spaces for .g4 file for consistency
vbarua Jul 5, 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
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ trim_trailing_whitespace = unset

[*.gradle.kts]
indent_size = 2

[.gitmodules]
indent_style = tab
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.gitmodule has not been updated in 2 years, but the check is firing (and failing) now for some reason.
Adding an explicit configuration for .gitmodule.

2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: editorconfig-checker/action-editorconfig-checker@main
- uses: editorconfig-checker/action-editorconfig-checker@v2
- run: editorconfig-checker
commitlint:
name: Lint commits for semantic-release
Expand Down
102 changes: 51 additions & 51 deletions core/src/main/antlr/SubstraitType.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,83 +99,83 @@ SingleQuote: '\'';


Number
: '-'? Int
: '-'? Int
;

Identifier
: ('a'..'z' | 'A'..'Z' | '_' | '$') ('a'..'z' | 'A'..'Z' | '_' | '$' | Digit)*
;

LineComment
: '//' ~[\r\n]* -> channel(HIDDEN)
;
: '//' ~[\r\n]* -> channel(HIDDEN)
;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm choosing spaces over tabs here because that it what is used in examples in the ANTLR repo
https://github.com/antlr/grammars-v4/tree/master


BlockComment
: ( '/*'
( '/'* BlockComment
| ~[/*]
| '/'+ ~[/*]
| '*'+ ~[/*]
)*
'*'*
'*/'
) -> channel(HIDDEN)
;
: ( '/*'
( '/'* BlockComment
| ~[/*]
| '/'+ ~[/*]
| '*'+ ~[/*]
)*
'*'*
'*/'
) -> channel(HIDDEN)
;

Whitespace
: [ \t]+ -> channel(HIDDEN)
;
: [ \t]+ -> channel(HIDDEN)
;

Newline
: ( '\r' '\n'?
| '\n'
)
;
: ( '\r' '\n'?
| '\n'
)
;


fragment Int
: '1'..'9' Digit*
| '0'
: '1'..'9' Digit*
| '0'
;

fragment Digit
: '0'..'9'
: '0'..'9'
;

start: expr EOF;

scalarType
: Boolean #Boolean
| I8 #i8
| I16 #i16
| I32 #i32
| I64 #i64
| FP32 #fp32
| FP64 #fp64
| String #string
| Binary #binary
| Timestamp #timestamp
| TimestampTZ #timestampTz
| Date #date
| Time #time
| IntervalDay #intervalDay
| IntervalYear #intervalYear
| UUID #uuid
| UserDefined Identifier #userDefined
;
: Boolean #Boolean
| I8 #i8
| I16 #i16
| I32 #i32
| I64 #i64
| FP32 #fp32
| FP64 #fp64
| String #string
| Binary #binary
| Timestamp #timestamp
| TimestampTZ #timestampTz
| Date #date
| Time #time
| IntervalDay #intervalDay
| IntervalYear #intervalYear
| UUID #uuid
| UserDefined Identifier #userDefined
;

parameterizedType
: FixedChar isnull='?'? Lt len=numericParameter Gt #fixedChar
| VarChar isnull='?'? Lt len=numericParameter Gt #varChar
| FixedBinary isnull='?'? Lt len=numericParameter Gt #fixedBinary
| Decimal isnull='?'? Lt precision=numericParameter Comma scale=numericParameter Gt #decimal
| PrecisionTimestamp isnull='?'? Lt precision=numericParameter Gt #precisionTimestamp
| PrecisionTimestampTZ isnull='?'? Lt precision=numericParameter Gt #precisionTimestampTZ
| Struct isnull='?'? Lt expr (Comma expr)* Gt #struct
| NStruct isnull='?'? Lt Identifier expr (Comma Identifier expr)* Gt #nStruct
| List isnull='?'? Lt expr Gt #list
| Map isnull='?'? Lt key=expr Comma value=expr Gt #map
;
: FixedChar isnull='?'? Lt len=numericParameter Gt #fixedChar
| VarChar isnull='?'? Lt len=numericParameter Gt #varChar
| FixedBinary isnull='?'? Lt len=numericParameter Gt #fixedBinary
| Decimal isnull='?'? Lt precision=numericParameter Comma scale=numericParameter Gt #decimal
| PrecisionTimestamp isnull='?'? Lt precision=numericParameter Gt #precisionTimestamp
| PrecisionTimestampTZ isnull='?'? Lt precision=numericParameter Gt #precisionTimestampTZ
| Struct isnull='?'? Lt expr (Comma expr)* Gt #struct
| NStruct isnull='?'? Lt Identifier expr (Comma Identifier expr)* Gt #nStruct
| List isnull='?'? Lt expr Gt #list
| Map isnull='?'? Lt key=expr Comma value=expr Gt #map
;

numericParameter
: Number #numericLiteral
Expand Down
Loading