[Commit-gnuradio] [gnuradio] 01/02: grc: Allow to use 'id' type for parameters

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fd3ce572962ab5f23f209f01db28ffd8661b0a84
Author: Sylvain Munaut <address@hidden>
Date:   Tue Feb 7 22:33:02 2017 +0100

    grc: Allow to use 'id' type for parameters
    
    Currently the type 'id' can only be used for the actual 'id' field.
    But it is useful to be able to use it for other things if you want
    to reference a block from another one.
    
    The only part where the current code doesn't work is when doing the
    evaluation because it uses the type only to check for ID uniqueness.
    
    This change uses both the type and the key. If the key is 'id' then it
    must be unique from all other key 'id'. But if the key is something else,
    then there must be an existing block to reference.
    
    Signed-off-by: Sylvain Munaut <address@hidden>
---
 grc/core/Param.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/grc/core/Param.py b/grc/core/Param.py
index 26f9d2f..afa478b 100644
--- a/grc/core/Param.py
+++ b/grc/core/Param.py
@@ -485,13 +485,20 @@ class Param(Element):
             # Can python use this as a variable?
             if not _check_id_matcher.match(v):
                 raise Exception('ID "{0}" must begin with a letter and may 
contain letters, numbers, and underscores.'.format(v))
-            ids = [param.get_value() for param in self.get_all_params(t)]
+            ids = [param.get_value() for param in self.get_all_params(t, 'id')]
 
-            # Id should only appear once, or zero times if block is disabled
-            if ids.count(v) > 1:
-                raise Exception('ID "{0}" is not unique.'.format(v))
             if v in ID_BLACKLIST:
                 raise Exception('ID "{0}" is blacklisted.'.format(v))
+
+            if self._key == 'id':
+                # Id should only appear once, or zero times if block is 
disabled
+                if ids.count(v) > 1:
+                    raise Exception('ID "{0}" is not unique.'.format(v))
+            else:
+                # Id should exist to be a reference
+                if ids.count(v) < 1:
+                    raise Exception('ID "{0}" does not exist.'.format(v))
+
             return v
 
         #########################
@@ -655,17 +662,19 @@ class Param(Element):
         else:
             return v
 
-    def get_all_params(self, type):
+    def get_all_params(self, type, key=None):
         """
-        Get all the params from the flowgraph that have the given type.
+        Get all the params from the flowgraph that have the given type and
+        optionally a given key
 
         Args:
             type: the specified type
+            key: the key to match against
 
         Returns:
             a list of params
         """
-        return sum([filter(lambda p: p.get_type() == type, block.get_params()) 
for block in self.get_parent().get_parent().get_enabled_blocks()], [])
+        return sum([filter(lambda p: ((p.get_type() == type) and ((key is 
None) or (p.get_key() == key))), block.get_params()) for block in 
self.get_parent().get_parent().get_enabled_blocks()], [])
 
     def is_enum(self):
         return self._type == 'enum'