Skip to content

Commit

Permalink
fix(csql_grammar): wrong merge resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
vimkim committed Dec 16, 2024
1 parent 00a0fde commit c57a01a
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions src/parser/csql_grammar.y
Original file line number Diff line number Diff line change
Expand Up @@ -21906,7 +21906,6 @@ primitive_type
DBG_PRINT}}
;

<<<<<<< HEAD
opt_vector_args
: /* empty */
{{ DBG_TRACE_GRAMMAR(opt_vector_args, : );
Expand Down Expand Up @@ -21934,35 +21933,6 @@ opt_vector_args
DBG_PRINT}}
;

opt_vector_args
: /* empty */
{{ DBG_TRACE_GRAMMAR(opt_vector_args, : );

container_2 ctn;
SET_CONTAINER_2 (ctn, NULL, NULL);
$$ = ctn;

DBG_PRINT}}
| '(' unsigned_integer ')'
{{ DBG_TRACE_GRAMMAR(opt_vector_args, | '(' unsigned_integer ')' );

container_2 ctn;
SET_CONTAINER_2 (ctn, $2, NULL);
$$ = ctn;

DBG_PRINT}}
| '(' unsigned_integer ',' primitive_type ')'
{{ DBG_TRACE_GRAMMAR(opt_vector_args, | '(' unsigned_integer ',' primitive_type ')' );

container_2 ctn;
// TODO: primitive_type not yet handled.
container_2 primitive_type_container = $4;

SET_CONTAINER_2 (ctn, $2, NULL);
$$ = ctn;

DBG_PRINT}}
;

opt_internal_external
: /* empty */
Expand Down

0 comments on commit c57a01a

Please sign in to comment.