From: Jason Woofenden Date: Mon, 21 Dec 2015 02:14:26 +0000 (-0500) Subject: cleanup, insertion modes for initial,head,etc X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=1dd403e5fec58bd28837e8d12c9c1455f1258062;p=peach-html5-editor.git cleanup, insertion modes for initial,head,etc --- diff --git a/parse-html.coffee b/parse-html.coffee index 1ae7a24..d35dd88 100644 --- a/parse-html.coffee +++ b/parse-html.coffee @@ -174,6 +174,10 @@ tag_name_chars = alnum + "-" # http://www.w3.org/TR/html5/infrastructure.html#space-character space_chars = "\u0009\u000a\u000c\u000d\u0020" +is_space = (txt) -> + return txt.length is 1 and space_chars.indexOf(txt) > -1 +is_space_tok = (t) -> + return t.type is TYPE_TEXT && t.text.length is 1 and space_chars.indexOf(t.text) > -1 # https://en.wikipedia.org/wiki/Whitespace_character#Unicode whitespace_chars = "\u0009\u000a\u000b\u000c\u000d\u0020\u0085\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000" @@ -341,8 +345,8 @@ decode_named_char_ref = (txt) -> parse_html = (txt, parse_error_cb = null) -> cur = 0 # index of next char in txt to be parsed - # declare tree and tokenizer variables so they're in scope below - tree = null + # declare doc and tokenizer variables so they're in scope below + doc = null open_els = null # stack of open elements afe = null # active formatting elements template_insertion_modes = null @@ -357,6 +361,7 @@ parse_html = (txt, parse_error_cb = null) -> form_element_pointer = null temporary_buffer = null pending_table_character_tokens = null + head_element_pointer = null parse_error = -> if parse_error_cb? @@ -440,6 +445,47 @@ parse_html = (txt, parse_error_cb = null) -> return false return false + clear_to_table_stopers = { + 'table': true + 'template': true + 'html': true + } + clear_stack_to_table_context = -> + loop + if clear_to_table_stopers[open_els[0].name]? + break + open_els.shift() + return + clear_to_table_body_stopers = { + 'tbody': true + 'tfoot': true + 'thead': true + 'template': true + 'html': true + } + clear_stack_to_table_body_context = -> + loop + if clear_to_table_body_stopers[open_els[0].name]? + break + open_els.shift() + return + clear_to_table_row_stopers = { + 'tr': true + 'template': true + 'html': true + } + clear_stack_to_table_row_context = -> + loop + if clear_to_table_row_stopers[open_els[0].name]? + break + open_els.shift() + return + clear_afe_to_marker = -> + loop + el = afe.shift() + if el.type is TYPE_AFE_MARKER + return + # 8.2.3.1 ... # http://www.w3.org/TR/html5/syntax.html#reset-the-insertion-mode-appropriately reset_insertion_mode = -> @@ -595,7 +641,7 @@ parse_html = (txt, parse_error_cb = null) -> # http://www.w3.org/TR/html5/syntax.html#unclosed-formatting-elements adoption_agency = (subject) -> debug_log "adoption_agency()" - debug_log "tree: #{serialize_els tree.children, false, true}" + debug_log "tree: #{serialize_els doc.children, false, true}" debug_log "open_els: #{serialize_els open_els, true, true}" debug_log "afe: #{serialize_els afe, true, true}" if open_els[0].name is subject @@ -707,7 +753,7 @@ parse_html = (txt, parse_error_cb = null) -> break node = node_next ? node_above debug_log "inner loop #{inner}" - debug_log "tree: #{serialize_els tree.children, false, true}" + debug_log "tree: #{serialize_els doc.children, false, true}" debug_log "open_els: #{serialize_els open_els, true, true}" debug_log "afe: #{serialize_els afe, true, true}" debug_log "ca: #{ca.name}##{ca.id} children: #{serialize_els ca.children, true, true}" @@ -801,7 +847,7 @@ parse_html = (txt, parse_error_cb = null) -> # at the appropriate place for inserting a node, but using common # ancestor as the override target. - # JASON: In the case where fe is immediately followed by fb: + # In the case where fe is immediately followed by fb: # * inner loop exits out early (node==fe) # * last_node is fb # * last_node is still in the tree (not a duplicate) @@ -818,7 +864,7 @@ parse_html = (txt, parse_error_cb = null) -> debug_log "fe: #{fe.name}##{fe.id} children: #{serialize_els fe.children, true, true}" debug_log "fb: #{fb.name}##{fb.id} children: #{serialize_els fb.children, true, true}" debug_log "last_node: #{last_node.name}##{last_node.id} children: #{serialize_els last_node.children, true, true}" - debug_log "tree: #{serialize_els tree.children, false, true}" + debug_log "tree: #{serialize_els doc.children, false, true}" debug_log "insert" @@ -834,7 +880,7 @@ parse_html = (txt, parse_error_cb = null) -> debug_log "fe: #{fe.name}##{fe.id} children: #{serialize_els fe.children, true, true}" debug_log "fb: #{fb.name}##{fb.id} children: #{serialize_els fb.children, true, true}" debug_log "last_node: #{last_node.name}##{last_node.id} children: #{serialize_els last_node.children, true, true}" - debug_log "tree: #{serialize_els tree.children, false, true}" + debug_log "tree: #{serialize_els doc.children, false, true}" # 15. Create an element for the token for which formatting element # was created, in the HTML namespace, with furthest block as the @@ -874,7 +920,7 @@ parse_html = (txt, parse_error_cb = null) -> break # 20. Jump back to the step labeled outer loop. debug_log "done wrapping fb's children. new_element: #{new_element.name}##{new_element.id}" - debug_log "tree: #{serialize_els tree.children, false, true}" + debug_log "tree: #{serialize_els doc.children, false, true}" debug_log "open_els: #{serialize_els open_els, true, true}" debug_log "afe: #{serialize_els afe, true, true}" debug_log "AAA DONE" @@ -1077,6 +1123,92 @@ parse_html = (txt, parse_error_cb = null) -> while end_tag_implied[open_els[0].name] and open_els[0].name isnt except open_els.shift() + # 8.2.5.4 The rules for parsing tokens in HTML content + # http://www.w3.org/TR/html5/syntax.html#parsing-main-inhtml + + # 8.2.5.4.1 The "initial" insertion mode + # http://www.w3.org/TR/html5/syntax.html#the-initial-insertion-mode + ins_mode_initial = (t) -> + if is_space_tok t + return + if t.type is TYPE_COMMENT + # fixfull this is supposed to be "the last child of the document object" + doc.children.push t + return + if t.type is TYPE_DOCTYPE + # fixfull + t.name = 'html' + doc.children.push t + insertion_mode = ins_mode_before_html + return + # Anything else + #fixfull (iframe, quirks) + insertion_mode = ins_mode_before_html + insertion_mode t # reprocess the token + return + + # 8.2.5.4.2 http://www.w3.org/TR/html5/syntax.html#the-before-html-insertion-mode + ins_mode_before_html = (t) -> + if t.type is TYPE_DOCTYPE + parse_error() + return + if t.type is TYPE_COMMENT + doc.children.push t + return + if is_space_tok t + return + if t.type is TYPE_START_TAG and t.name is 'html' + el = token_to_element t, NS_HTML, doc + open_els.unshift(el) + # fixfull (big paragraph in spec about manifest, fragment, urls, etc) + insertion_mode = ins_mode_before_head + return + if t.type is TYPE_END_TAG + if t.name is 'head' or t.name is 'body' or t.name is 'html' or t.name is 'br' + # fall through to "anything else" + else + parse_error() + return + # Anything else + html_tok = new_open_tag 'html' + el = token_to_element html_tok, NS_HTML, doc + doc.children.push el + open_els.unshift el + # ?fixfull browsing context + insertion_mode = ins_mode_before_head + insertion_mode t + return + + # 8.2.5.4.3 http://www.w3.org/TR/html5/syntax.html#the-before-head-insertion-mode + ins_mode_before_head = (t) -> + if is_space_tok t + return + if t.type is TYPE_COMMENT + insert_comment t + return + if t.type is TYPE_DOCTYPE + parse_error() + return + if t.type is TYPE_START_TAG and t.name is 'html' + ins_mode_in_body t + return + if t.type is TYPE_START_TAG and t.name is 'head' + el = insert_html_element t + head_element_pointer = el + insertion_mode = ins_mode_in_head + if t.type is TYPE_END_TAG + if t.name is 'head' or t.name is 'body' or t.name is 'html' or t.name is 'br' + # fall through to Anything else below + else + parse_error() + return + # Anything else + head_tok = new_open_tag 'head' + el = insert_html_element head_tok + head_element_pointer = el + insertion_mode = ins_mode_in_head + insertion_mode t # reprocess current token + # 8.2.5.4.4 http://www.w3.org/TR/html5/syntax.html#parsing-main-inhead ins_mode_in_head_else = (t) -> # factored out for same-as-spec flow control open_els.shift() # spec says this will be a 'head' node @@ -1156,10 +1288,66 @@ parse_html = (txt, parse_error_cb = null) -> else parse_error() return - if (t.type is TYPE_OPEN_TAG and t.name is 'head') or t.type is TYPE_END_TAG + if (t.type is TYPE_START_TAG and t.name is 'head') or t.type is TYPE_END_TAG parse_error() return ins_mode_in_head_else t + + # 8.2.5.4.5 http://www.w3.org/TR/html5/syntax.html#parsing-main-inheadnoscript + ins_mode_in_head_noscript = (t) -> + # FIXME ?fixfull + console.log "ins_mode_in_head_noscript unimplemented" + + # 8.2.5.4.6 http://www.w3.org/TR/html5/syntax.html#the-after-head-insertion-mode + ins_mode_after_head_else = (t) -> + body_tok = new_open_tag 'body' + insert_html_element body_tok + insertion_mode = ins_mode_in_body + insertion_mode t # reprocess token + return + ins_mode_after_head = (t) -> + if is_space_tok t + insert_character t + return + if t.type is TYPE_COMMENT + insert_comment t + return + if t.type is TYPE_DOCTYPE + parse_error() + return + if t.type is TYPE_START_TAG and t.name is 'html' + ins_mode_in_body t + return + if t.type is TYPE_START_TAG and t.name is 'body' + insert_html_element t + flag_frameset_ok = false + insertion_mode = ins_mode_in_body + return + if t.type is TYPE_START_TAG and t.name is 'frameset' + insert_html_element t + insertion_mode = ins_mode_in_frameset + return + if t.type is TYPE_START_TAG and (t.name is 'base' or t.name is 'basefont' or t.name is 'bgsound' or t.name is 'link' or t.name is 'meta' or t.name is 'noframes' or t.name is 'script' or t.name is 'style' or t.name is 'template' or t.name is 'title') + parse_error() + open_els.unshift head_element_pointer + ins_mode_in_head t + for el, i of open_els + if el is head_element_pointer + open_els.splice i, 1 + return + console.log "warning: 23904 couldn't find head element in open_els" + return + if t.type is TYPE_END_TAG and t.name is 'template' + ins_mode_in_head t + return + if t.type is TYPE_END_TAG and (t.name is 'body' or t.name is 'html' or t.name is 'br') + ins_mode_after_head_else t + return + if (t.type is TYPE_START_TAG and t.name is 'head') or t.type is TYPE_END_TAG + parse_error() + return + # Anything else + ins_mode_after_head_else t # 8.2.5.4.7 http://www.w3.org/TR/html5/syntax.html#parsing-main-inbody in_body_any_other_end_tag = (name) -> # factored out because adoption agency calls it @@ -1313,53 +1501,13 @@ parse_html = (txt, parse_error_cb = null) -> flag_foster_parenting = true # FIXME ins_mode_in_body t flag_foster_parenting = false - can_in_table = { - 'table': true - 'tbody': true - 'tfoot': true - 'thead': true - 'tr': true - } - clear_to_table_stopers = { + can_in_table = { # FIXME do this inline like everywhere else 'table': true - 'template': true - 'html': true - } - clear_stack_to_table_context = -> - loop - if clear_to_table_stopers[open_els[0].name]? - break - open_els.shift() - return - clear_to_table_body_stopers = { 'tbody': true 'tfoot': true 'thead': true - 'template': true - 'html': true - } - clear_stack_to_table_body_context = -> - loop - if clear_to_table_body_stopers[open_els[0].name]? - break - open_els.shift() - return - clear_to_table_row_stopers = { 'tr': true - 'template': true - 'html': true } - clear_stack_to_table_row_context = -> - loop - if clear_to_table_row_stopers[open_els[0].name]? - break - open_els.shift() - return - clear_afe_to_marker = -> - loop - el = afe.shift() - if el.type is TYPE_AFE_MARKER - return # 8.2.5.4.8 http://www.w3.org/TR/html5/syntax.html#parsing-main-incdata ins_mode_text = (t) -> @@ -1492,7 +1640,7 @@ parse_html = (txt, parse_error_cb = null) -> # Anything else all_space = true for old in pending_table_character_tokens - unless space_chars.indexOf(old.text) > -1 + unless is_space_tok old all_space = false break if all_space @@ -1542,7 +1690,7 @@ parse_html = (txt, parse_error_cb = null) -> # 8.2.5.4.12 http://www.w3.org/TR/html5/syntax.html#parsing-main-incolgroup ins_mode_in_column_group = (t) -> - if t.type is TYPE_TEXT and space_chars.indexOf(t.text) > -1 + if is_space_tok t insert_character t return if t.type is TYPE_COMMENT @@ -1724,6 +1872,129 @@ parse_html = (txt, parse_error_cb = null) -> # Anything Else ins_mode_in_body t + # 8.2.5.4.16 http://www.w3.org/TR/html5/syntax.html#parsing-main-inselect + ins_mode_in_select = (t) -> + if t.type is TYPE_TEXT and t.text is "\u0000" + parse_error() + return + if t.type is TYPE_TEXT + insert_character t + return + if t.type is TYPE_COMMENT + insert_comment t + return + if t.type is TYPE_DOCTYPE + parse_error() + return + if t.type is TYPE_START_TAG and t.name is 'html' + ins_mode_in_body t + return + if t.type is TYPE_START_TAG and t.name is 'option' + if open_els[0].name is 'option' + open_els.shift() + insert_html_element t + return + if t.type is TYPE_START_TAG and t.name is 'optgroup' + if open_els[0].name is 'option' + open_els.shift() + if open_els[0].name is 'optgroup' + open_els.shift() + insert_html_element t + return + if t.type is TYPE_END_TAG and t.name is 'optgroup' + if open_els[0].name is 'option' and open_els[1].name is 'optgroup' + open_els.shift() + if open_els[0].name is 'optgroup' + open_els.shift() + else + parse_error() + return + if t.type is TYPE_END_TAG and t.name is 'option' + if open_els[0].name is 'option' + open_els.shift() + else + parse_error() + return + if t.type is TYPE_END_TAG and t.name is 'select' + if is_in_select_scope 'select' + loop + el = open_els.shift() + if el.name is 'select' + break + reset_insertion_mode() + else + parse_error() + return + if t.type is TYPE_START_TAG and t.name is 'select' + parse_error() + loop + el = open_els.shift() + if el.name is 'select' + break + reset_insertion_mode() + # spec says that this is the same as but it doesn't say + # to check scope first + return + if t.type is TYPE_START_TAG and (t.name is 'input' or t.name is 'keygen' or t.name is 'textarea') + parse_error() + if is_in_select_scope 'select' + return + loop + el = open_els.shift() + if el.name is 'select' + break + reset_insertion_mode() + insertion_mode t + return + if t.type is TYPE_START_TAG and (t.name is 'script' or t.name is 'template') + ins_mode_in_head t + return + if t.type is TYPE_EOF + ins_mode_in_body t + return + # Anything else + parse_error() + return + + # 8.2.5.4.17 http://www.w3.org/TR/html5/syntax.html#parsing-main-inselectintable + ins_mode_in_select_in_table = (t) -> + if t.type is TYPE_START_TAG and (t.name is 'caption' or t.name is 'table' or t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead' or t.name is 'tr' or t.name is 'td' or t.name is 'th') + parse_error() + loop + el = open_els.shift() + if el.name is 'select' + break + reset_insertion_mode() + insertion_mode t + return + if t.type is TYPE_END_TAG and (t.name is 'caption' or t.name is 'table' or t.name is 'tbody' or t.name is 'tfoot' or t.name is 'thead' or t.name is 'tr' or t.name is 'td' or t.name is 'th') + parse_error() + unless is_in_table_scope t.name, NS_HTML + return + loop + el = open_els.shift() + if el.name is 'select' + break + reset_insertion_mode() + insertion_mode t + return + # Anything else + ins_mode_in_select t + return + + # CONTINUE more insertion modes! + + + + + + + + + + + + # 8.2.4.1 http://www.w3.org/TR/html5/syntax.html#data-state tok_state_data = -> switch c = txt.charAt(cur++) @@ -2293,11 +2564,11 @@ parse_html = (txt, parse_error_cb = null) -> # tree constructor initialization # see comments on TYPE_TAG/etc for the structure of this data - tree = new Node TYPE_TAG, name: 'html', namespace: NS_HTML - open_els = [tree] + doc = new Node TYPE_TAG, name: 'html', namespace: NS_HTML + open_els = [doc] afe = [] # active formatting elements template_insertion_modes = [] - insertion_mode = ins_mode_in_body + insertion_mode = ins_mode_initial original_insertion_mode = insertion_mode # TODO check spec flag_scripting = true # TODO might need an extra flag to get