首页 发现 帮助
登录
pascal
/
fpc
镜像自地址 https://gitlab.com/freepascal.org/fpc/source.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

* Fix bug ID #32389 (patch from Martok) to fix script parsing

git-svn-id: trunk@37863 -
michael 7 年之前
父节点
7b46b3d35e
当前提交
d997db7fa7
共有 4 个文件被更改，包括 34 次插入 和 6 次删除
合并视图 显示文件统计
  1. 2 0
      .gitattributes
  2. 6 0
      packages/fcl-xml/examples/test.html
  3. 19 0
      packages/fcl-xml/examples/testhtml.pp
  4. 7 6
      packages/fcl-xml/src/sax_html.pp

+ 2 - 0
.gitattributes
查看文件 

@@ -3458,6 +3458,8 @@ packages/fcl-xml/Makefile.fpc svneol=native#text/plain
 
 packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain
 
 packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain
 
 packages/fcl-xml/buildfclxml.lpi svneol=native#text/plain
 
 packages/fcl-xml/buildfclxml.lpi svneol=native#text/plain
 
 packages/fcl-xml/buildfclxml.pp svneol=native#text/plain
 
 packages/fcl-xml/buildfclxml.pp svneol=native#text/plain
 
+packages/fcl-xml/examples/test.html svneol=native#text/html
 
+packages/fcl-xml/examples/testhtml.pp svneol=native#text/plain
 
 packages/fcl-xml/fpmake.pp svneol=native#text/plain
 
 packages/fcl-xml/fpmake.pp svneol=native#text/plain
 
 packages/fcl-xml/src/README.txt svneol=native#text/plain
 
 packages/fcl-xml/src/README.txt svneol=native#text/plain
 
 packages/fcl-xml/src/dom.pp svneol=native#text/plain
 
 packages/fcl-xml/src/dom.pp svneol=native#text/plain

+ 6 - 0
packages/fcl-xml/examples/test.html
查看文件 

@@ -0,0 +1,6 @@
 
+<html><head>
 
+<script>
 
+   document.write('<title>Banner<\/title>');
 
+</script>
 
+</head>
 
+</html>

+ 19 - 0
packages/fcl-xml/examples/testhtml.pp
查看文件 

@@ -0,0 +1,19 @@
 
+program testhtml;
 
+{
 
+  simple demo to demonstrate rewriting a HTML file
 
+}
 
+uses sysutils, dom_html,sax_html, XMLWrite;
 
+
 
+Var
 
+  H : THTMLDocument;
 
+
 
+begin
 
+  if ParamCount<>2 then
 
+    begin
 
+    Writeln('Usage: ',ExtractFileName(Paramstr(0)),' inputfile outputfile');
 
+    Halt(1);
 
+    end;
 
+  ReadHTMLFile(H,ParamStr(1));
 
+  WriteXMLFile(H,Paramstr(2));
 
+end.
 
+

+ 7 - 6
packages/fcl-xml/src/sax_html.pp
查看文件 

@@ -553,16 +553,17 @@ begin
 
           AutoClose(TagName);
 
           AutoClose(TagName);
 
           namePush(TagName);
 
           namePush(TagName);
 
           DoStartElement('', TagName, '', Attr);
 
           DoStartElement('', TagName, '', Attr);
 
-          if not (efSubelementContent in HTMLElementProps[FStack[FNesting-1]].Flags) then begin
 
-            DoEndElement('', TagName, '');
 
-            NamePop;
 
-          end;
 
           if FStack[FNesting-1] in [etScript,etStyle] then
 
           if FStack[FNesting-1] in [etScript,etStyle] then
 
           begin
 
           begin
 
             NewContext := scScript;
 
             NewContext := scScript;
 
             FScriptEndTag := '</' + HTMLElementProps[FStack[FNesting-1]].Name;
 
             FScriptEndTag := '</' + HTMLElementProps[FStack[FNesting-1]].Name;
 
             FScriptEndMatchPos := 1;
 
             FScriptEndMatchPos := 1;
 
           end;
 
           end;
 
+          if (efSubcontent*HTMLElementProps[FStack[FNesting-1]].Flags=[]) then begin
 
+            // do not push empty elements, don't wait for AutoClose
 
+            DoEndElement('', TagName, '');
 
+            NamePop;
 
+          end;
 
         end;
 
         end;
 
         if Assigned(Attr) then
 
         if Assigned(Attr) then
 
           Attr.Free;
 
           Attr.Free;
 
@@ -574,8 +575,8 @@ begin
 
     scScript:
 
     scScript:
 
       begin
 
       begin
 
         DoCharacters(PSAXChar(TokenText), 0, Length(TokenText));
 
         DoCharacters(PSAXChar(TokenText), 0, Length(TokenText));
 
-        DoEndElement('', HTMLElementProps[FStack[FNesting-1]].Name, '');
 
-        namePop;
 
+        DoEndElement('', Copy(FScriptEndTag, 3), '');
 
+        NamePop;
 
         FScriptEndTag := '';
 
         FScriptEndTag := '';
 
       end;
 
       end;
 
   end;
 
   end;