@@ -2,7 +2,7 @@ ERL=erl ERLC=erlc ERLC_OPT=+debug_info -W -o ebin -all: tools src_src +all: src_src clean_gen: rm -f src/herml_scan.erl @@ -17,14 +17,7 @@ ebin: ebin_tests: mkdir ebin_tests -special: tools src/herml_scan.erl src/herml_parse.erl - -ebin_tools: - mkdir -p tools/ebin - -tools: ebin_tools - cd tools/src;erl -make - cp tools/src/leexinc.hrl tools/ebin +special: src/herml_scan.erl src/herml_parse.erl src_src: ebin src/herml_parse.erl src/herml.app cd src;erl -make @@ -44,4 +37,3 @@ src/herml_parse.erl: src/herml_scan.erl clean: clean_gen rm -f ebin/* rm -f ebin_tests/* - rm -f tools/ebin/* Makefile @@ -1,3 +1,2 @@ * Add a real front-end to manage and serve herml templates -* Add iteration over variables * Add the "alligator" operators (<>) TODO @@ -1,14 +1,14 @@ Nonterminals -tag_decl tag_stem id_attr class_attr attr_list attrs attr string -chr_list name name_list var_ref fun_call shortcuts +tag_decl tag_stem id_attr class_attr attr_list attrs attr name +var_ref fun_call shortcuts class_list iter_item iter iter_list template_stmt doctype_name. Terminals tag_start class_start id_start number -lcurly rcurly lbrace rbrace lparen rparen -at comma quote chr colon slash -dash lt space bang underscore. +lcurly rcurly lbrace rbrace +at comma chr colon slash +dash lt space bang underscore string. Rootsymbol template_stmt. @@ -29,32 +29,7 @@ iter_list -> iter_item comma iter_list : ['$1'|'$3']. var_ref -> at name : {var_ref, unwrap('$2')}. fun_call -> at name colon name : {fun_call, name_to_atom('$2'), name_to_atom('$4')}. -string -> quote chr_list quote : {string, '$2'}. -string -> quote quote : {string, ""}. - -chr_list -> chr : unwrap('$1'). -chr_list -> number : number_to_list('$1'). -chr_list -> tag_start : "%". -chr_list -> chr chr_list : unwrap('$1') ++ '$2'. -chr_list -> number chr_list : number_to_list('$1') ++ '$2'. -chr_list -> tag_start chr_list : "%" ++ '$2'. -chr_list -> class_start : ".". -chr_list -> class_start chr_list : "." ++ '$2'. -chr_list -> id_start : "#". -chr_list -> id_start chr_list : "#" ++ '$2'. -chr_list -> lparen : "(". -chr_list -> lparen chr_list : "(" ++ '$2'. -chr_list -> rparen : ")". -chr_list -> rparen chr_list : ")" ++ '$2'. -chr_list -> colon : ":". -chr_list -> colon chr_list : ":" ++ '$2'. -chr_list -> space : unwrap('$1'). -chr_list -> space chr_list : unwrap('$1') ++ '$2'. - -name -> name_list : {name, '$1'}. - -name_list -> chr : unwrap('$1'). -name_list -> chr name_list : unwrap('$1') ++ '$2'. +name -> chr : {name, unwrap('$1')}. id_attr -> id_start name : unwrap_label_attr(id, '$2'). id_attr -> id_start number : unwrap_label_attr(id, '$2'). @@ -124,7 +99,7 @@ unwrap({text, _, Value}) -> Value; unwrap({chr, _, Value}) -> Value; -unwrap({string, Value}) -> +unwrap({string, _, Value}) -> Value; unwrap({space, _, Value}) -> Value; src/herml_parse.yrl @@ -2,6 +2,7 @@ Definitions. D = [0-9] STRCHAR = [a-z|A-Z|0-9|_] + Rules. _ : {token, {underscore, TokenLine, TokenChars}}. @@ -10,6 +11,9 @@ _ : {token, {underscore, TokenLine, TokenChars}}. \. : {token, {class_start, TokenLine, TokenChars}}. # : {token, {id_start, TokenLine, TokenChars}}. {D}+ : {token, {number, TokenLine, list_to_integer(TokenChars)}}. +'(\\\^.|\\.|[^'])*' : + S = lists:sublist(TokenChars, 2, TokenLen - 2), + {token, {string, TokenLine, S}}. {STRCHAR}+ : {token, {chr, TokenLine, TokenChars}}. { : {token, {lcurly, TokenLine, TokenChars}}. } : {token, {rcurly, TokenLine, TokenChars}}. @@ -29,4 +33,3 @@ _ : {token, {underscore, TokenLine, TokenChars}}. \s : {token, {space, TokenLine, TokenChars}}. Erlang code. -%% Not used \ No newline at end of file src/herml_scan.xrl @@ -9,9 +9,7 @@ tokenizing_test_() -> ?_assertMatch({ok, [{class_start, _, _}], _}, herml_scan:string(".")), ?_assertMatch({ok, [{id_start, _, _}], _}, herml_scan:string("#")), ?_assertMatch({ok, [{chr, _, "abc"}], _}, herml_scan:string("abc")), - ?_assertMatch({ok, [{quote, _, _}, - {chr, _, "testing"}, - {quote, _, _}], _}, herml_scan:string("'testing'")), + ?_assertMatch({ok, [{string, _, "testing"}], _}, herml_scan:string("'testing'")), ?_assertMatch({ok, [{lcurly, _, _}], _}, herml_scan:string("{")), ?_assertMatch({ok, [{rcurly, _, _}], _}, herml_scan:string("}")), ?_assertMatch({ok, [{lbrace, _, _}], _}, herml_scan:string("[")), @@ -23,7 +21,9 @@ tokenizing_test_() -> ?_assertMatch({ok, [{slash, _, "/"}], _}, herml_scan:string("/")), ?_assertMatch({ok, [{dash, _, "-"}], _}, herml_scan:string("-")), ?_assertMatch({ok, [{chr, _, "abc"}, - {dash, _, "-"}, - {chr, _, "def"}], _}, herml_scan:string("abc-def")), + {dash, _, "-"}, + {chr, _, "def"}], _}, herml_scan:string("abc-def")), ?_assertMatch({ok, [{lt, _, "<"}], _}, herml_scan:string("<")), - ?_assertMatch({ok, [{gt, _, ">"}], _}, herml_scan:string(">"))]. + ?_assertMatch({ok, [{gt, _, ">"}], _}, herml_scan:string(">")), + ?_assertMatch({ok, [{string, _, "http://weblog.hypotheticalabs.com/?p=139"}], _}, + herml_scan:string("'http://weblog.hypotheticalabs.com/?p=139'"))]. tests/test_herml_scan.erl tools/src/Emakefile tools/src/leex.erl tools/src/leexinc.hrl 645d219913447ba9b5297a840b80539dda8ba277 Sean Cribbs seancribbs@gmail.com http://github.com/kevsmith/herml/commit/2044afdab982eb5abd5efcc9d673f6b2f60e14e0 2044afdab982eb5abd5efcc9d673f6b2f60e14e0 2009-02-17T12:38:35-08:00 2009-02-17T12:38:35-08:00 Use new leex and judo our string problem. b0830a2df1f38ff22f12ba6cd85967e5afff3cf2 Sean Cribbs seancribbs@gmail.com