erlurl/Emakefile erlurl/Makefile erlurl/Mnesia.nonode@nohost/DECISION_TAB.LOG erlurl/Mnesia.nonode@nohost/LATEST.LOG erlurl/Mnesia.nonode@nohost/last_token.DAT erlurl/Mnesia.nonode@nohost/schema.DAT erlurl/Mnesia.nonode@nohost/url_entry.DAT erlurl/headers.txt erlurl/priv/log/access.log.2009_02_08_22 erlurl/priv/log/access.log.2009_02_08_23 erlurl/priv/log/access.log.2009_02_09_00 erlurl/priv/log/access.log.2009_02_09_01 erlurl/priv/log/access.log.2009_02_09_02 erlurl/priv/log/access.log.2009_02_09_03 erlurl/priv/log/access.log.2009_02_09_04 erlurl/priv/log/access.log.2009_02_09_05 erlurl/priv/log/access.log.2009_02_09_06 erlurl/priv/log/access.log.2009_02_09_07 erlurl/priv/log/access.log.2009_02_09_08 erlurl/priv/log/access.log.2009_02_09_09 erlurl/priv/log/access.log.2009_02_09_10 erlurl/priv/log/access.log.2009_02_09_11 erlurl/priv/log/access.log.2009_02_09_12 erlurl/priv/log/access.log.2009_02_09_13 erlurl/priv/log/access.log.2009_02_09_14 erlurl/priv/log/access.log.2009_02_09_15 erlurl/priv/log/access.log.2009_02_09_16 erlurl/priv/log/access.log.2009_02_09_17 erlurl/priv/log/access.log.2009_02_09_18 erlurl/priv/log/access.log.2009_02_09_19 erlurl/priv/log/access.log.2009_02_09_20 erlurl/priv/log/access.log.2009_02_09_21 erlurl/priv/log/access.log.2009_02_09_22 erlurl/priv/log/access.log.2009_02_09_23 erlurl/priv/log/access.log.2009_02_10_00 erlurl/priv/log/access.log.2009_02_10_01 erlurl/priv/log/access.log.2009_02_10_02 erlurl/priv/log/access.log.2009_02_10_03 erlurl/priv/www/index.html erlurl/priv/www/jquery-1.3.1.js erlurl/src/erlurl.app erlurl/src/erlurl.erl erlurl/src/erlurl.hrl erlurl/src/erlurl_app.erl erlurl/src/erlurl_deps.erl erlurl/src/erlurl_generator.erl erlurl/src/erlurl_models.hrl erlurl/src/erlurl_resource.erl erlurl/src/erlurl_root_resource.erl erlurl/src/erlurl_store.erl erlurl/src/erlurl_sup.erl erlurl/src/erlurl_util.erl erlurl/start-dev.sh erlurl/start.sh @@ -5,7 +5,7 @@ (defun flymake-erlang-init () (let* ((temp-file (flymake-init-create-temp-buffer-copy - 'flymake-create-temp-inplace)) + 'flymake-create-temp-with-folder-structure)) (local-file (file-relative-name temp-file (file-name-directory buffer-file-name)))) emacs/flymake/flymake_config.el @@ -2,10 +2,14 @@ ERL=erl ERLC=erlc ERLC_OPT=+debug_info -W -o ebin -all: src_src +all: tools src_src + +clean_gen: + rm -f src/herml_scan.erl + rm -f src/herml_parser.erl tests: src_src src_tests - ${ERL} -pa ebin -pa ebin_tests -noshell -eval 'test_suite:test(), halt().' + ${ERL} -pa ebin -pa ebin_tests -noshell -s init stop -eval 'test_suite:test().' ebin: mkdir ebin @@ -13,12 +17,26 @@ ebin: ebin_tests: mkdir ebin_tests -src_src: ebin +ebin_tools: + mkdir -p tools/ebin + +tools: ebin_tools + cd tools/src;erl -make + cp tools/src/leexinc.hrl tools/ebin + +src_src: ebin src/herml_parse.erl cd src;erl -make src_tests: ebin_tests cd tests;erl -make -clean: +src/herml_scan.erl: tools + ${ERL} -pa tools/ebin -noshell -s init stop -eval 'leex:file("src/herml_scan.xrl", [{outdir, "src"}])' + +src/herml_parse.erl: src/herml_scan.erl + ${ERL} -noshell -s init stop -eval 'yecc:file("src/herml_parse.yrl")' + +clean: clean_gen rm -f ebin/* - rm -f ebin_tests/* \ No newline at end of file + rm -f ebin_tests/* + rm -f tools/ebin/* \ No newline at end of file herml/Makefile @@ -1,6 +1,6 @@ -module(herml_reader). --include("tree.hrl"). +-include("herml_tree.hrl"). -export([string/1, file/1]). @@ -26,97 +26,80 @@ string(Template) when is_binary(Template) -> parse_nodes(Contents) -> Lines = string:tokens(binary_to_list(Contents), ?EOLS), - T = build_raw_tree(Lines), - T1 = herml_tree_consolidator:consolidate(T), - transform(T1). - -transform(Tree) -> - transform(Tree, []). - -transform([H|T], Acc) when is_tuple(H) -> - Children = transform(H#node.children), - H1 = herml_tags:analyze(H#node.data), - transform(T, [H1#herml_node{children=Children}|Acc]); -transform([H|T], Acc) when length(H) == 0 -> - transform(T, Acc); -transform([], Acc) -> - lists:reverse(Acc). - -build_raw_tree(Lines) -> - build_raw_tree(Lines, 1, 0, dict:new()). - -build_raw_tree([H|T], LineCounter, PrevIndentLevel, State) -> + P1 = parse(Lines), + P2 = fix_continuations(P1, []), + MaxDepth = find_max_depth(P2, 0), + io:format("MaxDepth: ~p~n", [MaxDepth]), + rollup(lists:reverse(P2), MaxDepth). + +rollup(Tree, -1) -> + lists:reverse(Tree); +rollup(Tree, Depth) -> + rollup(parent(Tree, Depth, Depth - 1), Depth - 1). + +parent(Tree, ChildDepth, ParentDepth) -> + parent(Tree, ChildDepth, ParentDepth, [], []). + +parent([H|T], ChildDepth, ParentDepth, Children, Accum) -> + case H of + {node, ChildDepth, _, _} -> + parent(T, ChildDepth, ParentDepth, [H|Children], Accum); + {node, ParentDepth, Text, _} -> + parent(T, ChildDepth, ParentDepth, [], [{node, ParentDepth, Text, Children}|Accum]); + _ -> + parent(T, ChildDepth, ParentDepth, Children, [H|Accum]) + end; + +parent([], _, _, Children, []) -> + lists:reverse(Children); + +parent([], _, _, _, Accum) -> + lists:reverse(Accum). + +find_max_depth([{node, Level, _, _}|T], Max) -> + case Level > Max of + true -> + find_max_depth(T, Level); + false -> + find_max_depth(T, Max) + end; +find_max_depth([], Max) -> + Max. + +fix_continuations([H|T], Accum) -> + case H of + {cont, L} -> + [{node, Indent, L1, Children}|TA] = Accum, + fix_continuations(T, [{node, Indent, L1 ++ L, Children}|TA]); + _ -> + fix_continuations(T, [H|Accum]) + end; +fix_continuations([], Accum) -> + lists:reverse(Accum). + +parse(Lines) -> + parse(Lines, []). + +parse([H|T], Accum) -> case length(string:strip(H)) of 0 -> - build_raw_tree(T, LineCounter + 1, PrevIndentLevel, State); + parse(T, Accum); _ -> - IndentLevel = find_indent_level(H, PrevIndentLevel), - NewState = case dict:find(IndentLevel, State) of - {ok, Nodes} -> - dict:store(IndentLevel, [#node{data=H, line=LineCounter, parent=find_latest_parent(IndentLevel - 1, State)}|Nodes], State); - error -> - dict:store(IndentLevel, [#node{data=H, line=LineCounter, parent=find_latest_parent(IndentLevel - 1, State)}], State) - end, - build_raw_tree(T, LineCounter + 1, IndentLevel, NewState) + parse(T, [classify(H)|Accum]) end; -build_raw_tree([], _, _, State) -> - T = dict:fold(fun(Key, Value, Acc) -> - [{Key, lists:reverse(Value)}|Acc] end, - [], State), - reparent(lists:reverse(lists:keysort(1, T))). - -reparent(Nodes) when length(Nodes) == 1 -> - [{_, NodeList}] = Nodes, - NodeList; -reparent(Nodes) -> - [{_, Current}|T] = Nodes, - [{PI, Parents}|PT] = T, - reparent([{PI, reparent_nodes(Current, Parents)}|PT]). - -reparent_nodes([H|T], Parents) -> - reparent_nodes(T, reparent_node(H, Parents)); -reparent_nodes([], Parents) -> - lists:reverse(Parents). - -reparent_node(Node, Parents) -> - lists:foldl(fun(Parent, Acc) -> - case Parent#node.line == Node#node.parent of - true -> - [Parent#node{children=lists:append(Parent#node.children, [Node])}|Acc]; - false -> - [Parent|Acc] - end end, [], Parents). - -find_indent_level(Line, PrevIndentLevel) -> - Count = string:span(Line, " "), - RawIndentLevel = case Count rem 2 == 0 of - true -> - Count div 2; - false -> - throw({bad_indent, Line}) - end, - if - RawIndentLevel == PrevIndentLevel -> - PrevIndentLevel; - RawIndentLevel > PrevIndentLevel -> - PrevIndentLevel + 1; - RawIndentLevel < PrevIndentLevel -> - RawIndentLevel - end. +parse([], Accum) -> + lists:reverse(Accum). -find_latest_parent(PreviousIndent, _State) when PreviousIndent < 0 -> - 0; - -find_latest_parent(PreviousIndent, State) -> - case dict:find(PreviousIndent, State) of - {ok, Parents} -> - lists:foldr(fun(Parent, LineNo) -> - case Parent#node.line > LineNo of - true -> - Parent#node.line; - false -> - LineNo - end end, 0, Parents); - error -> - find_latest_parent(PreviousIndent - 1, State) +classify(Line) -> + Indent = count_indent(Line, 0), + case Indent rem 2 of + 0 -> + {node, Indent div 2, Line, []}; + _ -> + {cont, Line} end. + +count_indent([$\s|T], Count) -> + count_indent(T, Count + 1); +count_indent([_|_], Count) -> + Count. herml/src/herml_reader.erl @@ -2,6 +2,7 @@ This is a line. This is another line. This line is on the same line as the other one. This is the innermost one. + This is a continuation. This is the second group. This is another line in the second group. @@ -11,5 +12,5 @@ This is the second group. Third group one. Third group two. - Third group three. - Third group four. \ No newline at end of file +Third group three. + Third group four. \ No newline at end of file herml/tests/examples/simple_nesting.herml @@ -5,4 +5,6 @@ -include_lib("eunit/include/eunit.hrl"). all_test_() -> - [{module, test_herml_reader}]. + [{module, test_herml_scan}, + {module, test_herml_parse}, + {module, test_herml_reader}]. herml/tests/test_suite.erl @@ -25,6 +25,16 @@ process_post(ReqProps, Context) -> URL -> Token = tokenizer_store:associate_token(URL), write(Req, Token), + case webmachine_util:choose_media_type(?OUTPUT_MIMETYPES, Req:get_header_value("Accept")) of + none -> + {true, Context}; + "text/plain" -> + to_text(Req, Token); + "text/xml" -> + to_xml(Req, Token); + "application/json" -> + to_json(Req, Token) + end, {true, Context} end. tokenizer/src/tokenizer_token_resource.erl 35f69bc8fcaa151d1663af4ac11afa9301f488f5 kevsmith kevin@hypotheticalabs.com http://github.com/kevsmith/hypotheticalabs/commit/049517b69d7968e07b57afce62720e88e7c13fe1 049517b69d7968e07b57afce62720e88e7c13fe1 2009-02-09T19:55:49-08:00 2009-02-09T19:55:49-08:00 * First commit bfdd09c4f1984aead64a01f5390d8bc3cdc5a3eb kevsmith kevin@hypotheticalabs.com