Mercurial > octave

diff libinterp/parse-tree/token.cc @ 26718:9b0335f4bc74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revise naming of the parts of a superclass reference * token.h, pt-classdef.h: Use m_method_name instead of m_method_or_object_name. Change accessors and all uses to match.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Feb 2019 20:49:48 +0000
parents 581d01526b34
children 0ca7f17de041
line wrap: on
line diff
--- a/libinterp/parse-tree/token.cc	Sun Feb 10 08:41:15 2019 -0800
+++ b/libinterp/parse-tree/token.cc	Mon Feb 11 20:49:48 2019 +0000
@@ -73,11 +73,11 @@
       m_orig_text ()
   { }
 
-  token::token (int tv, const std::string& meth_or_obj,
-                const std::string& cls, int l, int c)
+  token::token (int tv, const std::string& meth, const std::string& cls,
+                int l, int c)
     : m_maybe_cmd (false), m_tspc (false), m_line_num (l), m_column_num (c),
       m_tok_val (tv), m_type_tag (scls_name_token),
-      m_tok_info (meth_or_obj, cls), m_orig_text ()
+      m_tok_info (meth, cls), m_orig_text ()
   { }
 
   token::~token (void)
@@ -132,10 +132,10 @@
   }
 
   std::string
-  token::superclass_method_or_object_name (void) const
+  token::superclass_method_name (void) const
   {
     assert (m_type_tag == scls_name_token);
-    return m_tok_info.m_superclass_info->m_method_or_object_name;
+    return m_tok_info.m_superclass_info->m_method_name;
   }
 
   std::string