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

List:       kde-commits
Subject:    quanta
From:       Andras Mantia <amantia () freemail ! hu>
Date:       2003-10-15 14:57:48
[Download RAW message or body]

CVS commit by amantia: 

Optimize group parsing in PHP. Patch by Melvyn Sopacua, mdev_from_idg.nl.
Update the ChangeLog.


  M +4 -1      ChangeLog   1.202
  M +3 -2      quanta/quanta_init.cpp   1.352
  M +2 -1      quanta/data/tags/php/description.rc   1.26
  M +1 -0      quanta/parser/parser.cpp   1.141
  M +1 -0      quanta/parser/qtag.h   1.48


--- quanta/ChangeLog  #1.201:1.202
@@ -63,5 +63,6 @@
     - autofill mandatory child tags
     - note with an icon if there is some parsing problem (like using a tag
-      without it's mandatory child elements)
+      without it's mandatory child elements). Give a description of the problem in \
the +      message window.
     - skip the html tags when spell-checking [#56586] [3.2]
     - project documentation in the documentation tree
@@ -69,4 +70,5 @@
     - a lot of script helping XML development
     - XSLT debugger: kxsldbg by Keith Isdale
+    - KFileReplace: search & replace in files
 
   - usability enhanchements:
@@ -88,4 +90,5 @@
     - new Quick Start dialog for HTML/XHTML DTD variants
     - up to 10 times faster project handling
+    - new, more powerful HTML table editor
   - new DCOP interfaces:
   - changed behavior:

--- quanta/quanta/quanta_init.cpp  #1.351:1.352
@@ -1414,4 +1414,5 @@ void QuantaApp::readTagDir(QString &dirN
       group.searchRx = dtdConfig->readEntry("SearchRx").stripWhiteSpace();
       group.hasSearchRx = !group.searchRx.pattern().isEmpty();
+      group.isMinimalSearchRx = dtdConfig->readBoolEntry("SearchRx_Minimal", false);
       group.clearRx = dtdConfig->readEntry("ClearRx").stripWhiteSpace();
       tagStr = dtdConfig->readEntry("Tag").stripWhiteSpace();

--- quanta/quanta/data/tags/php/description.rc  #1.25:1.26
@@ -33,5 +33,6 @@
 No_Name = No Inclusions
 Icon = attach
-SearchRx = (?:include|require|include_once|require_once)[\\s]+(?:(?:(?:\(|\"|\')+[^\)]*(?:\)|\"|\')+)|(?:\$.*))
 +SearchRx = (?:include|require)(?:_once)?\\s*[\(]?(?:(['"]).*\1|\$\w+)\\s*[\)]?\\s*;
+SearchRx_Minimal = true
 ClearRx = \n
 HasFileName = true

--- quanta/quanta/parser/parser.cpp  #1.140:1.141
@@ -2082,4 +2082,5 @@ void Parser::parseForScriptGroup(Node *n
       continue;
     pos = 0;
+    group.searchRx.setMinimal(group.isMinimalSearchRx);
     while (pos != -1)
     {

--- quanta/quanta/parser/qtag.h  #1.47:1.48
@@ -54,4 +54,5 @@ typedef struct StructTreeGroup{
         QRegExp searchRx;    //regular experssion to help us find the group - for \
pseudo DTDs  bool hasSearchRx;    //true if searchRx should be used
+        bool isMinimalSearchRx; // true if the searchRx should be non-greedy
         QRegExp clearRx;     //clear the text matched from the result of the \
                searchRx search - for pseudo DTDs
         QString tag;         //tags belonging to this group - for real DTDs


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