Some additional errors in the grammar. (a221e4e7) · Commits · Fred Eisele / fql

src/catdata/aql/grammar/build.boot

+0 −15

Changes for src/catdata/aql/grammar/build.boot: 0 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -96,20 +96,6 @@
		:show true
		:input (mapv str input-file-s)))))

		(deftask parse-immortals-sample
		[]
		(comp
		(antlr/exercise
		:parser "org.aql.AqlParser"
		:lexer "org.aql.AqlLexerRules"
		:start-rule "file"
		:input ["resource/sample/cp2_1_db.aql"]
		:tree false
		:edn true
		:rdf :jena
		:postscript false
		:tokens false)))

		(deftask parse-grammar
		[s show bool "show the arguments"]
		(s/check-asserts true)
		@@ -167,7 +153,6 @@
		[]
		(comp
		(build)
		(parse-immortals-sample)
		(parse-grammar)
		(parse-examples)
		;; (show :fileset true)

+4 −1

Changes for src/catdata/aql/grammar/src/antlr4/AqlInstance.g4: 4 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -200,8 +200,11 @@ instanceCoprodUnrestrictSection : allOptions ;
		instanceCoequalizeSection : allOptions ;

		instanceImportCsvSection
		: (schemaEntityId RARROW instanceCsvId)*
		: (schemaEntityId RARROW
		(LBRACE instanceCsvAssign+ RBRACE))*
		allOptions
		;

		instanceCsvAssign : instanceCsvId RARROW instanceCsvId ;

		instanceCsvId : symbol ;

+3 −1

Changes for src/catdata/aql/grammar/src/antlr4/AqlTypeside.g4: 3 added lines, 1 removed line.
Original line number	Diff line number	Diff line

		parser grammar AqlTypeside;
		options { tokenVocab=AqlLexerRules; }

		@@ -28,7 +29,8 @@ typesideLiteralSection
		;

		typesideImport
		: symbol #Typeside_ImportName
		: SQL #Typeside_ImportSql
		\| symbol #Typeside_ImportName
		;

		typesideTypeSig : typesideTypeId ;

+1047 −1012

File changed.

Preview size limit exceeded, changes collapsed.

+4346 −3764

File changed.

Preview size limit exceeded, changes collapsed.