Changeset: 47f0704652a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/47f0704652a2
Modified Files:
sql/server/sql_parser.y
Branch: Jun2023
Log Message:
Removed trailing white space, empty lines and improve indentation.
diffs (truncated from 3984 to 300 lines):
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -31,7 +31,7 @@ makeAtomNode(mvc *m, const char* type, c
#include <unistd.h>
#include <string.h>
-#define SA m->sa
+#define SA m->sa
#define _symbol_create(t,d) symbol_create( SA, t, d)
#define _symbol_create_list(t,d) symbol_create_list( SA, t, d)
#define _symbol_create_int(t,d) symbol_create_int( SA, t, d)
@@ -53,7 +53,7 @@ makeAtomNode(mvc *m, const char* type, c
#define Malloc(sz) ma_alloc(m->ta,sz)
#define YYMALLOC Malloc
-#define YYFREE ma_free
+#define YYFREE ma_free
#define YY_parse_LSP_NEEDED /* needed for bison++ 1.21.11-3 */
@@ -226,7 +226,7 @@ int yydebug=1;
default
default_value
delete_stmt
- domain_constraint_type
+ domain_constraint_type
drop_statement
drop_table_element
exec
@@ -427,9 +427,8 @@ int yydebug=1;
XML_element_name
XML_namespace_prefix
XML_PI_target
- opt_optimizer
- opt_default_role
-
+ opt_optimizer
+ opt_default_role
%type <l>
argument_list
@@ -531,8 +530,8 @@ int yydebug=1;
XML_element_content_and_option
XML_element_content_list
XML_value_expression_list
- opt_schema_details_list
- opt_qname
+ opt_schema_details_list
+ opt_qname
%type <i_val>
_transaction_mode_list
@@ -557,7 +556,7 @@ int yydebug=1;
opt_endianness
opt_for_each
opt_from_grantor
- opt_grantor
+ opt_grantor
opt_index_type
opt_match
opt_match_type
@@ -589,14 +588,14 @@ int yydebug=1;
with_or_without_data
XML_content_option
XML_whitespace_option
- opt_max_workers
+ opt_max_workers
%type <l_val>
lngval
poslng
nonzerolng
- opt_max_memory
+ opt_max_memory
%type <bval>
create
@@ -627,7 +626,7 @@ int yydebug=1;
/* sql prefixes to avoid name clashes on various architectures */
%token <sval>
IDENT UIDENT aTYPE ALIAS RANK sqlINT OIDNUM HEXADECIMAL INTNUM APPROXNUM
- USING
+ USING
GLOBAL CAST CONVERT
CHARACTER VARYING LARGE OBJECT VARCHAR CLOB sqlTEXT BINARY sqlBLOB
sqlDECIMAL sqlFLOAT
@@ -636,10 +635,10 @@ int yydebug=1;
BOOL_FALSE BOOL_TRUE
CURRENT_DATE CURRENT_TIMESTAMP CURRENT_TIME LOCALTIMESTAMP LOCALTIME
BIG LITTLE NATIVE ENDIAN
- LEX_ERROR
-
+ LEX_ERROR
+
/* the tokens used in geom */
-%token <sval> GEOMETRY GEOMETRYSUBTYPE GEOMETRYA
+%token <sval> GEOMETRY GEOMETRYSUBTYPE GEOMETRYA
%token USER CURRENT_USER SESSION_USER LOCAL BEST EFFORT
%token CURRENT_ROLE sqlSESSION CURRENT_SCHEMA CURRENT_TIMEZONE
@@ -666,7 +665,7 @@ int yydebug=1;
%token SCOLON AT
/* SQL/XML tokens */
-%token XMLCOMMENT XMLCONCAT XMLDOCUMENT XMLELEMENT XMLATTRIBUTES XMLFOREST
+%token XMLCOMMENT XMLCONCAT XMLDOCUMENT XMLELEMENT XMLATTRIBUTES XMLFOREST
%token XMLPARSE STRIP WHITESPACE XMLPI XMLQUERY PASSING XMLTEXT
%token NIL REF ABSENT EMPTY DOCUMENT ELEMENT CONTENT XMLNAMESPACES NAMESPACE
%token XMLVALIDATE RETURNING LOCATION ID ACCORDING XMLSCHEMA URI XMLAGG
@@ -709,7 +708,7 @@ SQLCODE SQLERROR UNDER WHENEVER
%token IS KEY ON OPTION OPTIONS
%token PATH PRIMARY PRIVILEGES
%token<sval> PUBLIC REFERENCES SCHEMA SET AUTO_COMMIT
-%token RETURN
+%token RETURN
%token ALTER ADD TABLE COLUMN TO UNIQUE VALUES VIEW WHERE WITH
%token<sval> sqlDATE TIME TIMESTAMP INTERVAL
@@ -724,65 +723,65 @@ SQLCODE SQLERROR UNDER WHENEVER
%token AS TRIGGER OF BEFORE AFTER ROW STATEMENT sqlNEW OLD EACH REFERENCING
%token OVER PARTITION CURRENT EXCLUDE FOLLOWING PRECEDING OTHERS TIES RANGE
UNBOUNDED GROUPS WINDOW
-%token X_BODY
+%token X_BODY
%token MAX_MEMORY MAX_WORKERS OPTIMIZER
/* odbc tokens */
%token DAYNAME MONTHNAME TIMESTAMPADD TIMESTAMPDIFF IFNULL
/* odbc data type tokens */
%token <sval>
- SQL_BIGINT
- SQL_BINARY
- SQL_BIT
- SQL_CHAR
- SQL_DATE
- SQL_DECIMAL
- SQL_DOUBLE
- SQL_FLOAT
- SQL_GUID
- SQL_HUGEINT
- SQL_INTEGER
- SQL_INTERVAL_DAY
- SQL_INTERVAL_DAY_TO_HOUR
- SQL_INTERVAL_DAY_TO_MINUTE
- SQL_INTERVAL_DAY_TO_SECOND
- SQL_INTERVAL_HOUR
- SQL_INTERVAL_HOUR_TO_MINUTE
- SQL_INTERVAL_HOUR_TO_SECOND
- SQL_INTERVAL_MINUTE
- SQL_INTERVAL_MINUTE_TO_SECOND
- SQL_INTERVAL_MONTH
- SQL_INTERVAL_SECOND
- SQL_INTERVAL_YEAR
- SQL_INTERVAL_YEAR_TO_MONTH
- SQL_LONGVARBINARY
- SQL_LONGVARCHAR
- SQL_NUMERIC
- SQL_REAL
- SQL_SMALLINT
- SQL_TIME
- SQL_TIMESTAMP
- SQL_TINYINT
- SQL_VARBINARY
- SQL_VARCHAR
- SQL_WCHAR
- SQL_WLONGVARCHAR
- SQL_WVARCHAR
- SQL_TSI_FRAC_SECOND
- SQL_TSI_SECOND
- SQL_TSI_MINUTE
- SQL_TSI_HOUR
- SQL_TSI_DAY
- SQL_TSI_WEEK
- SQL_TSI_MONTH
- SQL_TSI_QUARTER
- SQL_TSI_YEAR
+ SQL_BIGINT
+ SQL_BINARY
+ SQL_BIT
+ SQL_CHAR
+ SQL_DATE
+ SQL_DECIMAL
+ SQL_DOUBLE
+ SQL_FLOAT
+ SQL_GUID
+ SQL_HUGEINT
+ SQL_INTEGER
+ SQL_INTERVAL_DAY
+ SQL_INTERVAL_DAY_TO_HOUR
+ SQL_INTERVAL_DAY_TO_MINUTE
+ SQL_INTERVAL_DAY_TO_SECOND
+ SQL_INTERVAL_HOUR
+ SQL_INTERVAL_HOUR_TO_MINUTE
+ SQL_INTERVAL_HOUR_TO_SECOND
+ SQL_INTERVAL_MINUTE
+ SQL_INTERVAL_MINUTE_TO_SECOND
+ SQL_INTERVAL_MONTH
+ SQL_INTERVAL_SECOND
+ SQL_INTERVAL_YEAR
+ SQL_INTERVAL_YEAR_TO_MONTH
+ SQL_LONGVARBINARY
+ SQL_LONGVARCHAR
+ SQL_NUMERIC
+ SQL_REAL
+ SQL_SMALLINT
+ SQL_TIME
+ SQL_TIMESTAMP
+ SQL_TINYINT
+ SQL_VARBINARY
+ SQL_VARCHAR
+ SQL_WCHAR
+ SQL_WLONGVARCHAR
+ SQL_WVARCHAR
+ SQL_TSI_FRAC_SECOND
+ SQL_TSI_SECOND
+ SQL_TSI_MINUTE
+ SQL_TSI_HOUR
+ SQL_TSI_DAY
+ SQL_TSI_WEEK
+ SQL_TSI_MONTH
+ SQL_TSI_QUARTER
+ SQL_TSI_YEAR
%type <type>
- odbc_data_type
+ odbc_data_type
%type <i_val>
odbc_tsi_qualifier
-
+
/* odbc escape prefix tokens */
%token <sval>
ODBC_DATE_ESCAPE_PREFIX
@@ -817,12 +816,12 @@ sqlstmt:
YYACCEPT;
}
- | prepare {
+ | prepare {
if (!m->emode) /* don't replace m_deps/instantiate */
- m->emode = m_prepare;
- m->scanner.as = m->scanner.yycur;
+ m->emode = m_prepare;
+ m->scanner.as = m->scanner.yycur;
}
- sql SCOLON {
+ sql SCOLON {
if (m->sym) {
append_symbol(m->sym->data.lval, $3);
$$ = m->sym;
@@ -831,11 +830,11 @@ sqlstmt:
}
YYACCEPT;
}
- | SQL_PLAN {
- m->emode = m_plan;
- m->scanner.as = m->scanner.yycur;
+ | SQL_PLAN {
+ m->emode = m_plan;
+ m->scanner.as = m->scanner.yycur;
}
- sql SCOLON {
+ sql SCOLON {
if (m->sym) {
append_symbol(m->sym->data.lval, $3);
$$ = m->sym;
@@ -845,11 +844,11 @@ sqlstmt:
YYACCEPT;
}
- | SQL_EXPLAIN {
- m->emod |= mod_explain;
- m->scanner.as = m->scanner.yycur;
+ | SQL_EXPLAIN {
+ m->emod |= mod_explain;
+ m->scanner.as = m->scanner.yycur;
}
- sql SCOLON {
+ sql SCOLON {
if (m->sym) {
append_symbol(m->sym->data.lval, $3);
$$ = m->sym;
@@ -859,9 +858,9 @@ sqlstmt:
YYACCEPT;
}
- | SQL_TRACE {
- m->emod |= mod_trace;
- m->scanner.as = m->scanner.yycur;
+ | SQL_TRACE {
+ m->emod |= mod_trace;
+ m->scanner.as = m->scanner.yycur;
}
sqlstmt { $$ = $3; YYACCEPT; }
| exec SCOLON { m->sym = $$ = $1; YYACCEPT; }
@@ -875,12 +874,12 @@ sqlstmt:
prepare:
PREPARE
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
