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

Timestamp:

09/08/09 19:22:58 (3 years ago)

Author:

james

Message:

tidy up sillyThings learning filtering
fix minor logic error in %VAR processing
add adjectives into sillyThings output

File:

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

trunk/plugins/en/output_VAR.tcl

@@ -61 +61 @@
                 }
 
-                if {[lsearch $options_list "strip"] > -1} {
-                        set replacement [bMotion_strip_article $replacement]
-                } else {
+                if {[lsearch $options_list "strip"] == -1} {
                         if {$abstract == "sillyThings"} {
-                                if {[rand 100] > 80} {
-                                        set prefixes [list]
-                                        set replacement [bMotion_strip_article $replacement]
-                                        if [regexp -nocase "s$" $replacement] {
-                                                set prefixes [list "des " "les "]
-                                        } elseif [regexp -nocase "^\[aeiouy\]" $replacement] {
-                                                set prefixes [list "d'" "l'"]
-                                        } else {
-                                                set prefixes [list "de la " "du " "la " "le " "un " "une "]
-                                        }
-                                        set prefix [pickRandom $prefixes]
-                                        set replacement "$prefix$replacement"
-                                } else {
-                                        if {![rand 100]} {
-                                                regsub "((an?|the|some|his|her|their) )?" $replacement "\\1%VAR{noun_prefix} " replacement
-                                                set replacement [string trim $replacement]
+                                if {[rand 100] > 90} {
+                                        set mode [rand 2]
+                                        switch $mode {
+                                                0 {
+                                                        set prefixes [list]
+                                                        set replacement [bMotion_strip_article $replacement]
+                                                        if [regexp -nocase "s$" $replacement] {
+                                                                set prefixes [list "des " "les "]
+                                                        } elseif [regexp -nocase "^\[aeiouy\]" $replacement] {
+                                                                set prefixes [list "d'" "l'"]
+                                                        } else {
+                                                                set prefixes [list "de la " "du " "la " "le " "un " "une "]
+                                                        }
+                                                        set prefix [pickRandom $prefixes]
+                                                        set replacement "$prefix$replacement"
+                                                } 
+                                                1 {
+                                                        regsub "((an?|the|some|his|her|their) )?" $replacement "\\1%VAR{noun_prefix} " replacement
+                                                        set replacement [string trim $replacement]
+                                                }
                                         }
                                 }
@@ -86 +88 @@
                 }
 
-                if {[lsearch $options_list "verb"] > -1} {
-                        set replacement [bMotionMakeVerb $replacement]
+                foreach option $options_list {
+                        switch $option {
+                                "strip" {
+                                        set replacement [bMotion_strip_article $replacement]
+                                }
+                                "verb" {
+                                        set replacement [bMotionMakeVerb $replacement]
+                                }
+                                "past" {
+                                        set replacement [bMotion_make_past_tense $replacement]
+                                }
+                                "presentpart" {
+                                        set replacement [bMotion_make_present_participle $replacement]
+                                }
+                                "plural" {
+                                        set replacement [bMotionMakePlural $replacement]
+                                }
+                                "owner" {
+                                        set replacement [bMotionMakePossessive $replacement]
+                                }
+                                "underscore" {
+                                        set replacement [string map { " " "_" } $replacement]
+                                }
+                                "caps" {
+                                        set replacement [string toupper $replacement]
+                                }
+                        }
+
+                        # actually do the replacement
+                        regsub $whole_thing $line $replacement line
                 }
 
-                if {[lsearch $options_list "past"] > -1} {
-                        set replacement [bMotion_make_past_tense $replacement]
+                if {[llength $options_list] == 0} {
+                        regsub $whole_thing $line $replacement line
                 }
-
-                if {[lsearch $options_list "presentpart"] > -1} {
-                        set replacement [bMotion_make_present_participle $replacement]
-                }
-
-                if {[lsearch $options_list "plural"] > -1} {
-                        set replacement [bMotionMakePlural $replacement]
-                }
-
-                if {[lsearch $options_list "owner"] > -1} {
-                        set replacement [bMotionMakePossessive $replacement]
-                }
-
-                if {[lsearch $options_list "underscore"] > -1} {
-                        set replacement [string map { " " "_" } $replacement]
-                }
-
-                if {[lsearch $options_list "caps"] > -1} {
-                        set replacement [string toupper $replacement]
-                }
-
-                # actually do the replacement
-                regsub $whole_thing $line $replacement line
 
                 # check if what we swapped in gave us a %noun