Mercurial > octave

diff libinterp/parse-tree/pt-binop.cc @ 24846:7620f1f5290d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use m_ prefix for member variables in parse tree classes * pt-arg-list.cc, pt-arg-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-except.cc, pt-except.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-funcall.cc, pt-funcall.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jit.cc, pt-jit.h, pt-loop.cc, pt-loop.h, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt.cc, pt.h: Use m_ prefix for member variables in parse tree classes. Style fixes.
author John W. Eaton <jwe@octave.org>
date Wed, 07 Mar 2018 14:56:03 -0500
parents 194eb4bd202b
children 6652d3823428
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-binop.cc	Tue Mar 06 13:28:41 2018 -0500
+++ b/libinterp/parse-tree/pt-binop.cc	Wed Mar 07 14:56:03 2018 -0500
@@ -40,22 +40,22 @@
                      "Matlab-style short-circuit operation performed for operator %s",
                      op);
 
-    braindead_shortcircuit_warning_issued = true;
+    m_braindead_shortcircuit_warning_issued = true;
   }
 
   std::string
   tree_binary_expression::oper (void) const
   {
-    return octave_value::binary_op_as_string (etype);
+    return octave_value::binary_op_as_string (m_etype);
   }
 
   tree_expression *
   tree_binary_expression::dup (symbol_scope& scope) const
   {
     tree_binary_expression *new_be
-      = new tree_binary_expression (op_lhs ? op_lhs->dup (scope) : nullptr,
-                                    op_rhs ? op_rhs->dup (scope) : nullptr,
-                                    line (), column (), etype);
+      = new tree_binary_expression (m_lhs ? m_lhs->dup (scope) : nullptr,
+                                    m_rhs ? m_rhs->dup (scope) : nullptr,
+                                    line (), column (), m_etype);
 
     new_be->copy_base (*this);
 
@@ -69,7 +69,7 @@
   {
     std::string retval = "<unknown>";
 
-    switch (etype)
+    switch (m_etype)
       {
       case bool_and:
         retval = "&&";
@@ -90,9 +90,9 @@
   tree_boolean_expression::dup (symbol_scope& scope) const
   {
     tree_boolean_expression *new_be
-      = new tree_boolean_expression (op_lhs ? op_lhs->dup (scope) : nullptr,
-                                     op_rhs ? op_rhs->dup (scope) : nullptr,
-                                     line (), column (), etype);
+      = new tree_boolean_expression (m_lhs ? m_lhs->dup (scope) : nullptr,
+                                     m_rhs ? m_rhs->dup (scope) : nullptr,
+                                     line (), column (), m_etype);
 
     new_be->copy_base (*this);