[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    quanta_be: quanta
From:       Andras Mantia <amantia () freemail ! hu>
Date:       2004-01-16 10:09:28
Message-ID: 20040116100928.409C39081 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Two major bugfixes:
- special area group parsing was not working in every case
- opening of included files failed in some cases


  M +3 -0      TODO   1.13.2.3
  M +1 -1      quanta/data/tags/php/description.rc   1.28.2.2
  M +5 -2      quanta/parser/parser.cpp   1.146.2.33


--- quanta/TODO  #1.13.2.2:1.13.2.3
@@ -1,4 +1,7 @@
 Some items that needs to be done:
 
+Urgent fixes:
+- PHP parsing is broken when there is no { } in the code. Example: include_crash.php
+
 GUI/framework:
  - fix the parts (editor/html/plugin) GUI addition. Look at the FIXME in quanta.cpp

--- quanta/quanta/data/tags/php/description.rc  #1.28.2.1:1.28.2.2
@@ -38,5 +38,5 @@
 HasFileName = true
 ParseFile = true
-FileNameRx = (?:include|require|include_once|require_once|\(|\)|\"|\'|;$)
+FileNameRx = (?:^include|^require|^include_once|^require_once|\(|\)|\"|\'|;$)
 
 [StructGroup_2]

--- quanta/quanta/parser/parser.cpp  #1.146.2.32:1.146.2.33
@@ -1752,9 +1752,12 @@ Node* Parser::parseSpecialArea(const Are
 
           Node *n = parentNode->child;
-          while (n && n != currentNode)
+          while (n)
           {
             if (n->tag->type == Tag::Text || n->tag->type == Tag::ScriptStructureBegin)
               parseForScriptGroup(n);
+            if (n != currentNode)  
             n = n->nextSibling();
+            else 
+              break;  
           }
 


[prev in list] [next in list] [prev in thread] [next in thread]