Treat __name the same as __node (ros2#494)

* Treat __name the same as __node This modifies the lexer so that it will accept __name and treat it exactly the same as __node. __node still works in order to preserve backwards compatibility. Fixes ros2#258 Distribution Statement A; OPSEC #2893 Signed-off-by: P. J. Reed <preed@swri.org> * Update dot graph for lexer Distribution Statement A; OPSEC #2893 Signed-off-by: P. J. Reed <preed@swri.org>
ApexAI · Nov 22, 2019 · 8af6f17 · 8af6f17
1 parent 9034c40
commit 8af6f17
Show file tree

Hide file tree

Showing 4 changed files with 171 additions and 145 deletions.
diff --git a/rcl/include/rcl/lexer.h b/rcl/include/rcl/lexer.h
@@ -42,7 +42,7 @@ typedef enum rcl_lexeme_t
   RCL_LEXEME_URL_TOPIC = 4,
   /// :
   RCL_LEXEME_COLON = 5,
-  /// __node
+  /// __node or __name
   RCL_LEXEME_NODE = 6,
   /// __ns
   RCL_LEXEME_NS = 7,

diff --git a/rcl/src/rcl/arguments.c b/rcl/src/rcl/arguments.c
@@ -1557,7 +1557,7 @@ _rcl_parse_remap_namespace_replacement(
   return RCL_RET_OK;
 }
 
-/// Parse a nodename replacement rule (ex: `__node:=new_name`).
+/// Parse a nodename replacement rule (ex: `__node:=new_name` or `__name:=new_name`).
 /**
  * \sa _rcl_parse_remap_begin_remap_rule()
  */