Changeset 1051 for trunk

Timestamp:

11/10/09 18:08:14 (3 years ago)

Author:

james

Message:

fix broken abstracts
fix %% expanding to contain other macros

Location:

trunk/modules

Files:

• abstract.tcl (modified) (2 diffs)
• abstracts/en/abstracts.tcl (modified) (2 diffs)
• output.tcl (modified) (1 diff)

trunk/modules/abstract.tcl

@@ -172 +172 @@
 }
 
-proc bMotion_abstract_load { abstract } {
-        bMotion_putloglev 5 * "bMotion_abstract_load ($abstract)"
-  global bMotion_abstract_contents bMotion_abstract_timestamps
+proc bMotion_abstract_load { abstract } { 
+        bMotion_putloglev 5 * "bMotion_abstract_load ($abstract)" 
+        
+        global bMotion_abstract_contents bMotion_abstract_timestamps
   global bMotionModules bMotion_abstract_ondisk
   global bMotion_loading bMotion_testing
@@ -646 +647 @@
         catch {
                 set filter $bMotion_abstract_filter(_all)
+                bMotion_putloglev d * "abstract: found an _all filter, applying to $abstract"
                 bMotion_abstract_filter $abstract $filter
         }

trunk/modules/abstracts/en/abstracts.tcl

@@ -1036 +1036 @@
         "%REPEAT{3:7:m} %%"
         "helle%REPEAT{4:8:w}"
+        "%ruser!%|*%VAR{sillyVerbs}* %VAR{smiles}"
+        "%ruser!%|/%VAR{sillyVerbs:present}"
 }
 
@@ -5480 +5482 @@
 bMotion_abstract_add_filter "theRs" "sads"
 
+bMotion_abstract_add_filter "_all" "\{strip\}\}"
+bMotion_abstract_add_filter "_all" "\}\{strip\}"
+
 source "$bMotionModules/abstracts/en/randomstuff.tcl"
 

trunk/modules/output.tcl

@@ -241 +241 @@
         # Process macros
 
-        set text [bMotion_process_macros $channel $text]
-
-        # Run the plugins :D
-
-        # First run the core plugins
-        #set plugins [bMotion_plugin_find_output $bMotionInfo(language) $channel 0 10]
-        #if {[llength $plugins] > 0} {
-        #       foreach callback $plugins {
-        #               bMotion_putloglev 1 * "bMotion: output plugin: $callback..."
-        #               set result ""
-        #               catch {
-        #                       set result [$callback $channel $text]
-        #               } err
-        #               bMotion_putloglev 3 * "bMotion: returned from output $callback ($result)"
-        #               # TODO: Still used?
-        #               if {$result == ""} {
-        #                       return 0
-        #               }
-        #               set text $result
-        #       }
-        #}
-
-        set text [bMotionDoInterpolation $text $nick $moreText $channel]
+        set original_line $text
+        set done 0
+        while {$done == 0} {
+                set text [bMotion_process_macros $channel $text]
+
+                set text [bMotionDoInterpolation $text $nick $moreText $channel]
+
+                if {$text == $original_line} {
+                        set done 1
+                } else {
+                        set original_line $text
+                        bMotion_putloglev d * "output: going round macro loop again"
+                }
+        }
 
         # now the rest