Changeset 2103 for trunk/lomefc2/me_predicates.lua

Timestamp:

07/03/10 22:24:43 (19 months ago)

Author:

tolteque

Message:

o LOMEFC2:

• New Rules management

TODO: indentation and consistency check

tests

File:

• trunk/lomefc2/me_predicates.lua (modified) (6 diffs)

trunk/lomefc2/me_predicates.lua

@@ -983 +983 @@
     },
     
+    -- =============================================================
+    -- WARNING: keep these four decorations at the end of the list.
+    -- =============================================================
+    {
+        name       = "op_startGroup",
+        fields     = {},
+        decoration = "("
+    },
+    {
+        name       = "op_stopGroup",
+        fields     = {},
+        decoration = ")"
+    },
+    {
+        name       = "op_and",
+        fields     = {},
+        decoration = " and "
+    },
+    {
+        name       = "op_or",
+        fields     = {},
+        decoration = " or "
+    },
+};
+
+
+cdata = {
+
+    predicates =  {
+        op_startGroup             = _("("),
+        op_stopGroup              = _(")"),
+        op_and                    = _("and"),
+        op_or                     = _("or"),
     
-    -- for tests
-    {
-        name = "getLoInterface",
-        fields = {
-        }
-    },
-};
-
-
-cdata = {
-
-    predicates =  {
         c_unit_alive              = _("UNIT ALIVE"),
         c_unit_damaged            = _("UNIT DAMAGED"),
@@ -1035 +1056 @@
         
         c_file_exits              = _("FILE EXISTS"),
-        
-        
-        
-        
---        getLoInterface            = _("GET LO INTERFACE"),      
     },
 
@@ -1085 +1101 @@
       for _tmp, v in ipairs(rules) do
           local item = U.addListBoxItem(list, getRuleAsText(v, cdata), nil, v)
-
-          if v.operator == "or" then
+          local color
+          if v.decoration then
+              if v.decoration == "(" or v.decoration == ")" then
+                  color = Color.red
+              else
+                  color = Color.blue
+              end
               local theme = item:getTheme()
-              theme.normalTheme.text.color = Color.red
-              theme.selectedTheme.text.color = Color.red
+              theme.normalTheme.text.color = color
+              theme.selectedTheme.text.color = color
               item:setTheme(theme)  
           end
@@ -1102 +1123 @@
 function getRuleAsText(rule, cdata)
     local ruleDescr = rule.predicate
-    local str = getPredicateName(ruleDescr, cdata) .. ' ('
-
-    local first = true
-    local needComma = false
-    for _tmp, field in ipairs(ruleDescr.fields) do
-        if needComma then
-            str = str .. ', '
-        else
-            needComma = true
+    local str = getPredicateName(ruleDescr, cdata)
+    if not ruleDescr.decoration then
+        str = str .. ' ('
+        local first = true
+        local needComma = false
+        for _tmp, field in ipairs(ruleDescr.fields) do
+            if needComma then
+                str = str .. ', '
+            else
+                needComma = true
+            end
+
+            local text
+            if field.displayFunc then
+                text = field.displayFunc(cdata, rule[field.id])
+            else
+                text = tostring(rule[field.id])
+            end
+
+            if first and ruleDescr.firstValueAsName then
+                str = text .. ' ('
+                needComma = false
+            else
+                str = str .. text
+            end
+
+            first = false
         end
 
-        local text
-        if field.displayFunc then
-            text = field.displayFunc(cdata, rule[field.id])
-        else
-            text = tostring(rule[field.id])
-        end
-
-        if first and ruleDescr.firstValueAsName then
-            str = text .. ' ('
-            needComma = false
-        else
-            str = str .. text
-        end
-
-        first = false
-    end
-
-    str = str .. ')'
-    return str
+        str = str .. ')'
+      end
+   return str
 end
 
@@ -1378 +1401 @@
 -- copy default values from rule descriptions
 function setRuleDefaults(rule, descr)
+    -- Remove decoration field if it exists
+    if rule.decoration then
+        rule.decoration = nil
+    end
+    
+    -- Insert/Remove decoration according to the rule type
+    if descr.decoration then
+       rule.decoration = descr.decoration
+    elseif rule.decoration then
+       rule.decoration = nil
+    end
+    
     for _tmp, v in ipairs(descr.fields) do
         if not rule[v.id] then
@@ -1496 +1531 @@
 
     for i = 1, #toRemove do
+        base.print("invalid rule" )
         table.remove(rulesList, toRemove[i] - (i - 1))
     end