Skip to content

Commit fa2acf2

Browse files
committed
Merge branch 'main' into hb-csv-wide-table
# Conflicts: # sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl # sdks/python/src/lqp/proto/v1/logic_pb2.pyi
2 parents b4e782a + d6a3a89 commit fa2acf2

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

meta/src/meta/grammar.y

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ csv_locator_paths
11271127
: "(" "paths" STRING* ")"
11281128

11291129
csv_locator_inline_data
1130-
: "(" "inline_data" STRING ")"
1130+
: "(" "inline_data" FORMATTED_STRING ")"
11311131

11321132
csvlocator
11331133
: "(" "csv_locator" csv_locator_paths? csv_locator_inline_data? ")"

sdks/go/src/parser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4293,9 +4293,9 @@ func (p *Parser) parse_csv_locator_paths() []string {
42934293
func (p *Parser) parse_csv_locator_inline_data() string {
42944294
p.consumeLiteral("(")
42954295
p.consumeLiteral("inline_data")
4296-
string1187 := p.consumeTerminal("STRING").Value.str
4296+
formatted_string1187 := p.consumeTerminal("STRING").Value.str
42974297
p.consumeLiteral(")")
4298-
return string1187
4298+
return formatted_string1187
42994299
}
43004300

43014301
func (p *Parser) parse_csv_config() *pb.CSVConfig {

sdks/julia/LogicalQueryProtocol.jl/src/parser.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3616,9 +3616,9 @@ end
36163616
function parse_csv_locator_inline_data(parser::ParserState)::String
36173617
consume_literal!(parser, "(")
36183618
consume_literal!(parser, "inline_data")
3619-
string1187 = consume_terminal!(parser, "STRING")
3619+
formatted_string1187 = consume_terminal!(parser, "STRING")
36203620
consume_literal!(parser, ")")
3621-
return string1187
3621+
return formatted_string1187
36223622
end
36233623

36243624
function parse_csv_config(parser::ParserState)::Proto.CSVConfig

sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3978,7 +3978,7 @@ function pretty_csv_locator_inline_data(pp::PrettyPrinter, msg::String)
39783978
write(pp, "(inline_data")
39793979
indent_sexp!(pp)
39803980
newline(pp)
3981-
write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1415))
3981+
write(pp, format_string(pp, fields1415))
39823982
dedent!(pp)
39833983
write(pp, ")")
39843984
end

sdks/python/src/lqp/gen/parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3304,9 +3304,9 @@ def parse_csv_locator_paths(self) -> Sequence[str]:
33043304
def parse_csv_locator_inline_data(self) -> str:
33053305
self.consume_literal("(")
33063306
self.consume_literal("inline_data")
3307-
string1187 = self.consume_terminal("STRING")
3307+
formatted_string1187 = self.consume_terminal("STRING")
33083308
self.consume_literal(")")
3309-
return string1187
3309+
return formatted_string1187
33103310

33113311
def parse_csv_config(self) -> logic_pb2.CSVConfig:
33123312
span_start1189 = self.span_start()

0 commit comments

Comments
 (0)