Changeset 1019 for trunk/plugins/en/output_VAR.tcl

Timestamp:

08/23/09 19:22:05 (3 years ago)

Author:

james

Message:

New output parser for core plugins - should fix problems with late replacements getting missed

File:

• trunk/plugins/en/output_VAR.tcl (modified) (4 diffs)

trunk/plugins/en/output_VAR.tcl

@@ -1 @@
-#
-#
 # vim: fdm=indent fdn=1
 #
@@ -6 +4 @@
 ###############################################################################
 # This is a bMotion plugin
-# Copyright (C) James Michael Seward 2000-2008
+# Copyright (C) James Michael Seward 2000-2009
 #
 # This program is covered by the GPL, please refer the to LICENCE file in the
@@ -32 +30 @@
         regsub {%VAR\{([^\}]+)\}\{strip\}} $line "%VAR{\\1:strip}" line
 
-        set lastloop ""
-
-        while {[regexp -nocase {(%VAR\{([^\}:]+)(:[^\}]+)?\}(\{strip\})?)} $line matches whole_thing abstract options clean]} {
+        if {[regexp -nocase {(%VAR\{([^\}:]+)(:[^\}]+)?\}(\{strip\})?)} $line matches whole_thing abstract options clean]} {
                 global $abstract
                 #see if we have a new-style abstract available
@@ -126 +122 @@
                         set line [bMotionInsertString $line "%noun" "%VAR{sillyThings}"]
                 }
-
-                if {$lastloop == $line} {
-                        putlog "bMotion: ALERT! looping too much in %VAR code with $line (no change since last parse)"
-                        set line "/has a tremendous error while trying to sort something out :("
-                        break
-                }
-                set lastloop $line
         }