Skip to content

Solving #37,#38,#29 and #10 #46

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

Open
Subhiiiiii wants to merge 1 commit into
base: grammar_optimization
Choose a base branch
from
Open

Solving #37,#38,#29 and #10 #46

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
18 changes: 9 additions & 9 deletions .settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
Expand Down Expand Up @@ -57,15 +57,15 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
Expand All @@ -79,7 +79,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
Expand Down
109 changes: 109 additions & 0 deletions grammars/expr_types.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
// Type annotations for SQL expressions
// This file contains type annotations for the core expression rules in SQL

// Expression rules with type annotations
expr returns [SQLType type]
: boolPri (IS_SYMBOL notRule? type = (TRUE_SYMBOL | FALSE_SYMBOL | UNKNOWN_SYMBOL))? # exprIs
| NOT_SYMBOL expr # exprNot
| expr op = (AND_SYMBOL | LOGICAL_AND_OPERATOR) expr # exprAnd
| expr XOR_SYMBOL expr # exprXor
| expr op = (OR_SYMBOL | LOGICAL_OR_OPERATOR) expr # exprOr
;

boolPri returns [SQLType type]
: predicate # primaryExprPredicate
| boolPri IS_SYMBOL notRule? NULL_SYMBOL # primaryExprIsNull
| boolPri compOp predicate # primaryExprCompare
| boolPri compOp (ALL_SYMBOL | ANY_SYMBOL) subquery # primaryExprAllAny
;

predicate returns [SQLType type]
: bitExpr (
notRule? predicateOperations
| MEMBER_SYMBOL OF_SYMBOL? simpleExprWithParentheses
| SOUNDS_SYMBOL LIKE_SYMBOL bitExpr
)?
;

bitExpr returns [SQLType type]
: simpleExpr # bitExprSimple
| bitExpr op = BITWISE_XOR_OPERATOR bitExpr # bitExprXor
| bitExpr op = (MULT_OPERATOR | DIV_OPERATOR | MOD_OPERATOR | DIV_SYMBOL | MOD_SYMBOL) bitExpr # bitExprArithmetic
| bitExpr op = (PLUS_OPERATOR | MINUS_OPERATOR) bitExpr # bitExprAddSub
| bitExpr op = (PLUS_OPERATOR | MINUS_OPERATOR) INTERVAL_SYMBOL expr interval # bitExprInterval
| bitExpr op = (SHIFT_LEFT_OPERATOR | SHIFT_RIGHT_OPERATOR) bitExpr # bitExprShift
| bitExpr op = BITWISE_AND_OPERATOR bitExpr # bitExprAnd
| bitExpr op = BITWISE_OR_OPERATOR bitExpr # bitExprOr
;

simpleExpr returns [SQLType type]
: columnRef jsonOperator? # simpleExprColumnRef
| runtimeFunctionCall # simpleExprRuntimeFunction
| functionCall # simpleExprFunction
| simpleExpr COLLATE_SYMBOL textOrIdentifier # simpleExprCollate
| literalOrNull # simpleExprLiteral
| PARAM_MARKER # simpleExprParamMarker
| rvalueSystemOrUserVariable # simpleExpressionRValue
| inExpressionUserVariableAssignment # simpleExprUserVariableAssignment
| sumExpr # simpleExprSum
| groupingOperation # simpleExprGroupingOperation
| windowFunctionCall # simpleExprWindowingFunction
| simpleExpr CONCAT_PIPES_SYMBOL simpleExpr # simpleExprConcat
| op = (PLUS_OPERATOR | MINUS_OPERATOR | BITWISE_NOT_OPERATOR) simpleExpr # simpleExprUnary
| not2Rule simpleExpr # simpleExprNot
| ROW_SYMBOL? OPEN_PAR_SYMBOL exprList CLOSE_PAR_SYMBOL # simpleExprList
| EXISTS_SYMBOL? subquery # simpleExprSubQuery
| OPEN_CURLY_SYMBOL identifier expr CLOSE_CURLY_SYMBOL # simpleExprOdbc
| MATCH_SYMBOL identListArg AGAINST_SYMBOL OPEN_PAR_SYMBOL bitExpr fulltextOptions? CLOSE_PAR_SYMBOL # simpleExprMatch
| BINARY_SYMBOL simpleExpr # simpleExprBinary
| CAST_SYMBOL OPEN_PAR_SYMBOL expr (AT_SYMBOL LOCAL_SYMBOL)? AS_SYMBOL castType arrayCast? CLOSE_PAR_SYMBOL # simpleExprCast
| CAST_SYMBOL OPEN_PAR_SYMBOL expr AT_SYMBOL TIME_SYMBOL ZONE_SYMBOL INTERVAL_SYMBOL? textStringLiteral AS_SYMBOL DATETIME_SYMBOL typeDatetimePrecision CLOSE_PAR_SYMBOL # simpleExprCastTime
| CASE_SYMBOL expr? (whenExpression thenExpression)+ elseExpression? END_SYMBOL # simpleExprCase
| CONVERT_SYMBOL OPEN_PAR_SYMBOL expr COMMA_SYMBOL castType CLOSE_PAR_SYMBOL # simpleExprConvert
| CONVERT_SYMBOL OPEN_PAR_SYMBOL expr USING_SYMBOL charsetName CLOSE_PAR_SYMBOL # simpleExprConvertUsing
| DEFAULT_SYMBOL OPEN_PAR_SYMBOL simpleIdentifier CLOSE_PAR_SYMBOL # simpleExprDefault
| VALUES_SYMBOL OPEN_PAR_SYMBOL simpleIdentifier CLOSE_PAR_SYMBOL # simpleExprValues
| INTERVAL_SYMBOL expr interval PLUS_OPERATOR expr # simpleExprInterval
;

// Type annotations for literals
literalOrNull returns [SQLType type]
: NUMERIC_LITERAL # literalNumeric
| STRING_LITERAL # literalString
| NULL_SYMBOL # literalNull
| TRUE_SYMBOL # literalTrue
| FALSE_SYMBOL # literalFalse
;

// Type annotations for functions
functionCall returns [SQLType type]
: functionName OPEN_PAR_SYMBOL (functionArgs? | MULT_OPERATOR) CLOSE_PAR_SYMBOL
;

// Type annotations for operators
compOp returns [SQLType type]
: EQUAL_OPERATOR # compOpEqual
| NULL_SAFE_EQUAL_OPERATOR # compOpNullSafeEqual
| GREATER_OR_EQUAL_OPERATOR # compOpGreaterEqual
| GREATER_THAN_OPERATOR # compOpGreater
| LESS_OR_EQUAL_OPERATOR # compOpLessEqual
| LESS_THAN_OPERATOR # compOpLess
| NOT_EQUAL_OPERATOR # compOpNotEqual
;

// Type annotations for casts
castType returns [SQLType type]
: BINARY_SYMBOL fieldLength? # castTypeBinary
| CHAR_SYMBOL fieldLength? charsetWithOptBinary? # castTypeChar
| nchar fieldLength? # castTypeNChar
| SIGNED_SYMBOL INT_SYMBOL? # castTypeSigned
| UNSIGNED_SYMBOL INT_SYMBOL? # castTypeUnsigned
| DATE_SYMBOL # castTypeDate
| TIME_SYMBOL typeDatetimePrecision? # castTypeTime
| DATETIME_SYMBOL typeDatetimePrecision? # castTypeDateTime
| DECIMAL_SYMBOL floatOptions? # castTypeDecimal
| JSON_SYMBOL # castTypeJson
| realType # castTypeReal
| FLOAT_SYMBOL standardFloatOptions? # castTypeFloat
| spatialType # castTypeSpatial
;
Loading