@matdata/yasqe 4.6.1 → 4.7.4

package/grammar/util/gen_ll1.pl

@@ -1,37 +1,37 @@
-:-dynamic fo/2.
-:-dynamic fi/2.
-:-dynamic cf/2.
-:-dynamic change/0.
-:-dynamic m/3.
-:-dynamic tm/1.
-:-dynamic '==>'/2.
-:-dynamic '=>'/2.
-:-op(550,xfy,===>).  % Rewrite rules on EBNF expressions
-:-op(500,xfy,==>).   % EBNF grammar productions
-:-op(500,xfy,=>).    % BNF grammar productions
-:-op(490,xfy,or).
-:-op(480,fy,*).
-:-op(470,xfy,\).
-
-
-:-reconsult('rewrite.pl').
-:-reconsult('ll1.pl').
-:-reconsult('prune').
-:-reconsult('output_to_javascript.pl').
-
-go:-
-	ebnf_to_bnf,
-	prune_for_top_symbol,
-	ll1_tables,
-	ll1_check,
-	output_file(Out),
-	write('Writing to '),write(Out),nl,
-	tell(Out),
-	output_table_js,
-	output_keywords_js,
-	output_punct_js,
-	js_vars(Vars),
-	output_vars_js(Vars),
-  write('}'),
-	told.
-	
+:-dynamic fo/2.
+:-dynamic fi/2.
+:-dynamic cf/2.
+:-dynamic change/0.
+:-dynamic m/3.
+:-dynamic tm/1.
+:-dynamic '==>'/2.
+:-dynamic '=>'/2.
+:-op(550,xfy,===>).  % Rewrite rules on EBNF expressions
+:-op(500,xfy,==>).   % EBNF grammar productions
+:-op(500,xfy,=>).    % BNF grammar productions
+:-op(490,xfy,or).
+:-op(480,fy,*).
+:-op(470,xfy,\).
+
+
+:-reconsult('rewrite.pl').
+:-reconsult('ll1.pl').
+:-reconsult('prune').
+:-reconsult('output_to_javascript.pl').
+
+go:-
+	ebnf_to_bnf,
+	prune_for_top_symbol,
+	ll1_tables,
+	ll1_check,
+	output_file(Out),
+	write('Writing to '),write(Out),nl,
+	tell(Out),
+	output_table_js,
+	output_keywords_js,
+	output_punct_js,
+	js_vars(Vars),
+	output_vars_js(Vars),
+  write('}'),
+	told.
+	

package/grammar/util/gen_sparql11.pl

@@ -1,11 +1,11 @@
-
-top_symbol(sparql11).
-output_file('_tokenizer-table.js').
-
-js_vars([
-  startSymbol='"sparql11"',
-  acceptEmpty=true
-]).
-
-:-reconsult(gen_ll1).
-:-reconsult('../sparql11-grammar.pl').
+
+top_symbol(sparql11).
+output_file('_tokenizer-table.js').
+
+js_vars([
+  startSymbol='"sparql11"',
+  acceptEmpty=true
+]).
+
+:-reconsult(gen_ll1).
+:-reconsult('../sparql11-grammar.pl').

package/grammar/util/ll1.pl

@@ -1,175 +1,175 @@
-
-/*
-
-Compute LL1 parse tables.
-
-fi(NT,T) means that T can be the first terminal in NT.  The special
-         token epsilon means that NT may rewrite to nothing
-         (NT is "nullable").
-
-fo(NT,T) means that nonterminal NT can be followed by terminal T.
-         - the final argument is for debugging only, and records
-           the nonterminal from which the follower T was copied.
-
-stephen.cresswell@tso.co.uk
-
-*/
-
-
-ll1_tables:-
-	retractall(cf(_,_)),
-	retractall(nt(_)),
-	retractall(fi(_,_)),
-	retractall(fo(_,_)),
-	retractall(m(_,_,_)),
-	
-	validate_rules,
-	remember1(change),
-	iterate_first,
-	remember1(change),
-	iterate_follow,
-	iterate_matrix.
-
-validate_rules:-
-	NT=>_,
-	\+ (_=>RHS, memberchk(NT,RHS) ),
-	format("Warning: unused non-terminal: ~w~n",[NT]),
-	fail.
-validate_rules:-
-	% (Check the untranslated rules)
-	LHS ==> RHS,
-	\+RHS=[],
-	\+RHS=[_|_],
-	format("Warning: atomic RHS: ~w~n",[LHS=>RHS]),
-	fail.
-validate_rules:-
-	_ => RHS,
-	member(T,RHS),
-	\+ T => _,
-	remember(tm(T)),
-	fail.
-validate_rules:-
-	tm(T),
-	\+declared_terminal(T),
-	format("Warning: undeclared terminal: ~w~n",[T]),
-	fail.
-validate_rules:-
-	declared_terminal(T),
-	\+tm(T),
-	format("Declared terminal not found in grammar: ~w~n",[T]),
-	fail.
-validate_rules.
-
-declared_terminal(T):-
-	tm_keywords(Ts),
-	member(T,Ts).
-declared_terminal(T):-
-	tm_regex(Ts),
-	member(T,Ts).
-declared_terminal(T):-
-	tm_punct(Ts),
-	member(T=_,Ts).
-
-% Repeated until no change
-iterate_first:-
-	change,
-	!,
-	retractall(change),
-	iterate,
-	iterate_first.
-iterate_first.
-
-% All possibilities
-iterate:-
-	first(A,W),
-	remember(fi(A,W)),
-	fail.
-iterate.
-
-assert_terminals:-
-	tm(Tm),
-	assertz(fi(Tm,Tm)),
-	fail.
-assert_terminals.
-        
-
-first(Tm,Tm):-
-	tm(Tm).
-first(Nonterm,F):-
-        Nonterm=>RHS,
-	first_list(RHS,F).
-
-first_list([],epsilon).
-first_list([W|RHS],F):-
-	fi(W,epsilon),
-	first_list(RHS,F).
-first_list([W|_],F):-
-	fi(W,F),
-	F \== epsilon.
-
-
-iterate_follow:-
-	change,
-	!,
-	retractall(change),
-	iterate_f,
-	iterate_follow.
-iterate_follow.
-
-iterate_f:-
-	follow,
-	fail.
-iterate_f.
-
-
-follow:-
-	B => RHS,
-	follow_list(RHS,B).
-
-follow_list([X],B):-
-	!,
-	copy_follow(B,X).
-follow_list([A|RHS],B):-
-	tm(A),!,
-	follow_list(RHS,B).	
-follow_list([A,X2|RHS],B):-
-	first_list([X2|RHS],F),
-	(F=epsilon -> 
-	    copy_follow(B,A)
-        ;
-	    remember(fo(A,F))
-        ),
-	follow_list([X2|RHS],B).	
-
-% Whatever can follow B, can follow A
-%  (applied when A can be final constituent of B)
-copy_follow(B,A):-
-	\+tm(A),
-	remember1(cf(B,A)),
-	fo(B,Fo),
-	remember(fo(A,Fo)),
-	fail.
-copy_follow(_,_).
-
-iterate_matrix:-
-	A => RHS,
-	first_list(RHS,F),
-	F \== epsilon,
-	remember1(m(A,F,A=>RHS)),
-	fail.
-iterate_matrix:-
-	A => RHS,
-	first_list(RHS,epsilon),
-	fo(A,F),
-	remember1(m(A,F,A=>RHS)),
-	fail.
-iterate_matrix.
-
-ll1_check:-
-	m(NT,T,R1),
-	m(NT,T,R2),
-	R1@<R2,
-	format('LL(1) clash - ~w, ~w,~n R1=~w~n R2=~w~n',[NT,T,R1,R2]),
-	fail.
-ll1_check:-
-	write('LL(1) check complete.'),nl.
+
+/*
+
+Compute LL1 parse tables.
+
+fi(NT,T) means that T can be the first terminal in NT.  The special
+         token epsilon means that NT may rewrite to nothing
+         (NT is "nullable").
+
+fo(NT,T) means that nonterminal NT can be followed by terminal T.
+         - the final argument is for debugging only, and records
+           the nonterminal from which the follower T was copied.
+
+stephen.cresswell@tso.co.uk
+
+*/
+
+
+ll1_tables:-
+	retractall(cf(_,_)),
+	retractall(nt(_)),
+	retractall(fi(_,_)),
+	retractall(fo(_,_)),
+	retractall(m(_,_,_)),
+	
+	validate_rules,
+	remember1(change),
+	iterate_first,
+	remember1(change),
+	iterate_follow,
+	iterate_matrix.
+
+validate_rules:-
+	NT=>_,
+	\+ (_=>RHS, memberchk(NT,RHS) ),
+	format("Warning: unused non-terminal: ~w~n",[NT]),
+	fail.
+validate_rules:-
+	% (Check the untranslated rules)
+	LHS ==> RHS,
+	\+RHS=[],
+	\+RHS=[_|_],
+	format("Warning: atomic RHS: ~w~n",[LHS=>RHS]),
+	fail.
+validate_rules:-
+	_ => RHS,
+	member(T,RHS),
+	\+ T => _,
+	remember(tm(T)),
+	fail.
+validate_rules:-
+	tm(T),
+	\+declared_terminal(T),
+	format("Warning: undeclared terminal: ~w~n",[T]),
+	fail.
+validate_rules:-
+	declared_terminal(T),
+	\+tm(T),
+	format("Declared terminal not found in grammar: ~w~n",[T]),
+	fail.
+validate_rules.
+
+declared_terminal(T):-
+	tm_keywords(Ts),
+	member(T,Ts).
+declared_terminal(T):-
+	tm_regex(Ts),
+	member(T,Ts).
+declared_terminal(T):-
+	tm_punct(Ts),
+	member(T=_,Ts).
+
+% Repeated until no change
+iterate_first:-
+	change,
+	!,
+	retractall(change),
+	iterate,
+	iterate_first.
+iterate_first.
+
+% All possibilities
+iterate:-
+	first(A,W),
+	remember(fi(A,W)),
+	fail.
+iterate.
+
+assert_terminals:-
+	tm(Tm),
+	assertz(fi(Tm,Tm)),
+	fail.
+assert_terminals.
+        
+
+first(Tm,Tm):-
+	tm(Tm).
+first(Nonterm,F):-
+        Nonterm=>RHS,
+	first_list(RHS,F).
+
+first_list([],epsilon).
+first_list([W|RHS],F):-
+	fi(W,epsilon),
+	first_list(RHS,F).
+first_list([W|_],F):-
+	fi(W,F),
+	F \== epsilon.
+
+
+iterate_follow:-
+	change,
+	!,
+	retractall(change),
+	iterate_f,
+	iterate_follow.
+iterate_follow.
+
+iterate_f:-
+	follow,
+	fail.
+iterate_f.
+
+
+follow:-
+	B => RHS,
+	follow_list(RHS,B).
+
+follow_list([X],B):-
+	!,
+	copy_follow(B,X).
+follow_list([A|RHS],B):-
+	tm(A),!,
+	follow_list(RHS,B).	
+follow_list([A,X2|RHS],B):-
+	first_list([X2|RHS],F),
+	(F=epsilon -> 
+	    copy_follow(B,A)
+        ;
+	    remember(fo(A,F))
+        ),
+	follow_list([X2|RHS],B).	
+
+% Whatever can follow B, can follow A
+%  (applied when A can be final constituent of B)
+copy_follow(B,A):-
+	\+tm(A),
+	remember1(cf(B,A)),
+	fo(B,Fo),
+	remember(fo(A,Fo)),
+	fail.
+copy_follow(_,_).
+
+iterate_matrix:-
+	A => RHS,
+	first_list(RHS,F),
+	F \== epsilon,
+	remember1(m(A,F,A=>RHS)),
+	fail.
+iterate_matrix:-
+	A => RHS,
+	first_list(RHS,epsilon),
+	fo(A,F),
+	remember1(m(A,F,A=>RHS)),
+	fail.
+iterate_matrix.
+
+ll1_check:-
+	m(NT,T,R1),
+	m(NT,T,R2),
+	R1@<R2,
+	format('LL(1) clash - ~w, ~w,~n R1=~w~n R2=~w~n',[NT,T,R1,R2]),
+	fail.
+ll1_check:-
+	write('LL(1) check complete.'),nl.

package/grammar/util/output_to_javascript.pl

@@ -1,75 +1,75 @@
-/* Convert computed LL(1) table into javascript source
-*/
-
-output_table_js:-
-	write('module.exports = {table:'),nl,
-	setof(LHS, RHS^(LHS=>RHS), NTs),
-	form_table(NTs,'{'),
-	nl,write('},').
-
-output_terminals_js:-
-	nl,nl,write('var terminal=['),nl,
-	tm_regex(Ks),
-	member(TM,Ks),
-	format('   { name: "~w", regex:new RegExp("^"+~w) }, ~n',[TM,TM]),
-	fail.
-output_terminals_js:-
-        write('];'),nl,nl.
-output_keywords_js:-
-	tm_keywords(Ps),
-	findall(Reg,member(Reg,Ps),Regs),
-	nl,nl,write('keywords:/^('),
-	output_as_regex_disj(Regs,''),
-	write(')/i ,'),nl.
-output_punct_js:-
-	tm_punct(Ps),
-	findall(Reg,member(_=Reg,Ps),Regs),
-	nl,write('punct:/^('),
-	output_as_regex_disj(Regs,''),
-	write(')/ ,'),nl,nl.
-output_top_symbol_js:-
-	start_symbol(TS),
-	format('startSymbol:"~w";~n',[TS]).
-output_default_query_type_js:-
-	default_query_type(QT),
-	format('defaultQueryType:~w;~n',[QT]).
-output_lex_version_js:-
-	lex_version(LV),
-	format('lexVersion:"~w";~n',[LV]).
-output_accept_empty_js:-
-	accept_empty(AE),
-	format('acceptEmpty:"~w";~n',[AE]).
-
-output_vars_js([]).
-output_vars_js([Var=Val|Pairs]):-
-	format('~w:~w,~n',[Var,Val]),
-	output_vars_js(Pairs).
-
-output_as_regex_disj([],_).
-output_as_regex_disj([T|Ts],Prefix):-
-    format('~w~w',[Prefix,T]),
-    output_as_regex_disj(Ts,'|').
-
-form_table([],_).
-form_table([NT|NTs],Punc):-
-	format('~w~n  "~w" : ',[Punc,NT]),
-	findall(First-RHS,m(NT,First,_=>RHS),Pairs),
-	output_pairs(Pairs,'{'),
-	write('}'),
-	form_table(NTs,', ').
-
-output_pairs([],_).
-output_pairs([First-RHS|Pairs],Punc):-
-	format('~w~n     "~w": ',[Punc,First]),
-	write_list_strings(RHS),
-	output_pairs(Pairs, ', ').
-
-write_list_strings(Xs):-
-	write('['),
-	write_list_strings1(Xs,''),
-	write(']').
-
-write_list_strings1([],_).
-write_list_strings1([X|Xs],Punc):-
-	format('~w"~w"',[Punc,X]),
-	write_list_strings1(Xs,',').
+/* Convert computed LL(1) table into javascript source
+*/
+
+output_table_js:-
+	write('module.exports = {table:'),nl,
+	setof(LHS, RHS^(LHS=>RHS), NTs),
+	form_table(NTs,'{'),
+	nl,write('},').
+
+output_terminals_js:-
+	nl,nl,write('var terminal=['),nl,
+	tm_regex(Ks),
+	member(TM,Ks),
+	format('   { name: "~w", regex:new RegExp("^"+~w) }, ~n',[TM,TM]),
+	fail.
+output_terminals_js:-
+        write('];'),nl,nl.
+output_keywords_js:-
+	tm_keywords(Ps),
+	findall(Reg,member(Reg,Ps),Regs),
+	nl,nl,write('keywords:/^('),
+	output_as_regex_disj(Regs,''),
+	write(')/i ,'),nl.
+output_punct_js:-
+	tm_punct(Ps),
+	findall(Reg,member(_=Reg,Ps),Regs),
+	nl,write('punct:/^('),
+	output_as_regex_disj(Regs,''),
+	write(')/ ,'),nl,nl.
+output_top_symbol_js:-
+	start_symbol(TS),
+	format('startSymbol:"~w";~n',[TS]).
+output_default_query_type_js:-
+	default_query_type(QT),
+	format('defaultQueryType:~w;~n',[QT]).
+output_lex_version_js:-
+	lex_version(LV),
+	format('lexVersion:"~w";~n',[LV]).
+output_accept_empty_js:-
+	accept_empty(AE),
+	format('acceptEmpty:"~w";~n',[AE]).
+
+output_vars_js([]).
+output_vars_js([Var=Val|Pairs]):-
+	format('~w:~w,~n',[Var,Val]),
+	output_vars_js(Pairs).
+
+output_as_regex_disj([],_).
+output_as_regex_disj([T|Ts],Prefix):-
+    format('~w~w',[Prefix,T]),
+    output_as_regex_disj(Ts,'|').
+
+form_table([],_).
+form_table([NT|NTs],Punc):-
+	format('~w~n  "~w" : ',[Punc,NT]),
+	findall(First-RHS,m(NT,First,_=>RHS),Pairs),
+	output_pairs(Pairs,'{'),
+	write('}'),
+	form_table(NTs,', ').
+
+output_pairs([],_).
+output_pairs([First-RHS|Pairs],Punc):-
+	format('~w~n     "~w": ',[Punc,First]),
+	write_list_strings(RHS),
+	output_pairs(Pairs, ', ').
+
+write_list_strings(Xs):-
+	write('['),
+	write_list_strings1(Xs,''),
+	write(']').
+
+write_list_strings1([],_).
+write_list_strings1([X|Xs],Punc):-
+	format('~w"~w"',[Punc,X]),
+	write_list_strings1(Xs,',').