Changeset 4756634 in mainline

Timestamp:

2010-12-03T22:10:49Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ba8de9c3

Parents:

62bb73e

Message:

More nomenclature cleanup.

File:

• tools/config.py (modified) (4 diffs)

tools/config.py

@@ -232 +232 @@
                 
                 if (not varname in config):
-                        default = None
+                        value = None
                 else:
-                        default = config[varname]
-
-                if not rule_value_is_valid((varname, vartype, name, choices, cond), default):
-                        default = None
-
-                rdef = rule_get_default((varname, vartype, name, choices, cond))
-                if rdef != None:
-                        default = rdef
-                        config[varname] = rdef
+                        value = config[varname]
+
+                if not rule_value_is_valid((varname, vartype, name, choices, cond), value):
+                        value = None
+
+                default = rule_get_default((varname, vartype, name, choices, cond))
+                if default != None:
+                        config[varname] = default
 
                 if (not varname in config):
@@ -377 +376 @@
                 
                 if (not varname in config):
-                        default = ''
+                        value = ''
                 else:
-                        default = config[varname]
-                        if (default == '*'):
-                                default = 'y'
-                
-                outmk.write('# %s\n%s = %s\n\n' % (name, varname, default))
+                        value = config[varname]
+                        if (value == '*'):
+                                value = 'y'
+                
+                outmk.write('# %s\n%s = %s\n\n' % (name, varname, value))
                 
                 if ((vartype == "y") or (vartype == "n") or (vartype == "y/n") or (vartype == "n/y")):
-                        if (default == "y"):
+                        if (value == "y"):
                                 outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
                                 defs += ' -D%s' % varname
                 else:
-                        outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
-                        defs += ' -D%s=%s -D%s_%s' % (varname, default, varname, default)
+                        outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, value, varname, value))
+                        defs += ' -D%s=%s -D%s_%s' % (varname, value, varname, value)
         
         if (revision is not None):
@@ -502 +501 @@
                                 
                                 if (not varname in config):
-                                        default = None
+                                        value = None
                                 else:
-                                        default = config[varname]
-                                
-                                if not rule_value_is_valid(rule, default):
-                                        default = None
-
-                                rdef = rule_get_default(rule)
-                                if rdef != None:
-                                        default = rdef
-                                        config[varname] = rdef
-
-                                option = rule_get_option(rule, default)
+                                        value = config[varname]
+                                
+                                if not rule_value_is_valid(rule, value):
+                                        value = None
+
+                                default = rule_get_default(rule)
+                                if default != None:
+                                        value = default
+                                        config[varname] = default
+
+                                option = rule_get_option(rule, value)
                                 if option != None:
                                         options.append(option)
@@ -549 +548 @@
                         
                         if (not selname in config):
-                                default = None
+                                value = None
                         else:
-                                default = config[selname]
+                                value = config[selname]
                         
                         if (seltype == 'choice'):
-                                config[selname] = subchoice(screen, name, choices, default)
+                                config[selname] = subchoice(screen, name, choices, value)
                         elif ((seltype == 'y/n') or (seltype == 'n/y')):
                                 if (config[selname] == 'y'):