Mercurial > octave

changeset 33114:4379474e9d3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* token.h (class token): Use member initializers where possible.
author John W. Eaton <jwe@octave.org>
date Thu, 29 Feb 2024 15:00:40 -0500
parents 29879576a5b6
children 985d25d4eafd
files libinterp/parse-tree/token.h
diffstat 1 files changed, 17 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/token.h	Thu Feb 29 14:02:41 2024 -0500
+++ b/libinterp/parse-tree/token.h	Thu Feb 29 15:00:40 2024 -0500
@@ -71,52 +71,34 @@
     while_end,
   };
 
+public:
+
   token (int tv, const filepos& beg_pos, const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv), m_type_tag (generic_token),
-      m_tok_info (), m_orig_text ()
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv)
   { }
 
-  token (int tv, bool is_kw, const filepos& beg_pos,
-         const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv),
-      m_type_tag (is_kw ? keyword_token : generic_token), m_tok_info (),
-      m_orig_text ()
+  token (int tv, bool is_kw, const filepos& beg_pos, const filepos& end_pos)
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (is_kw ? keyword_token : generic_token)
   { }
 
-  token (int tv, const char *s, const filepos& beg_pos,
-         const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv), m_type_tag (string_token),
-      m_tok_info (s), m_orig_text ()
+  token (int tv, const char *s, const filepos& beg_pos, const filepos& end_pos)
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (string_token), m_tok_info (s)
   { }
 
-  token (int tv, const std::string& s, const filepos& beg_pos,
-         const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv), m_type_tag (string_token),
-      m_tok_info (s), m_orig_text ()
+  token (int tv, const std::string& s, const filepos& beg_pos, const filepos& end_pos)
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (string_token), m_tok_info (s)
   { }
 
-  token (int tv, const octave_value& val, const std::string& s,
-         const filepos& beg_pos, const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv), m_type_tag (numeric_token),
-      m_tok_info (val), m_orig_text (s)
+  token (int tv, const octave_value& val, const std::string& s, const filepos& beg_pos, const filepos& end_pos)
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (numeric_token), m_tok_info (val), m_orig_text (s)
   { }
 
   token (int tv, end_tok_type t, const filepos& beg_pos, const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv), m_type_tag (ettype_token),
-      m_tok_info (t), m_orig_text ()
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (ettype_token), m_tok_info (t)
   { }
 
-  token (int tv, const std::string& meth, const std::string& cls,
-         const filepos& beg_pos, const filepos& end_pos)
-    : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos),
-      m_end_pos (end_pos), m_tok_val (tv), m_type_tag (scls_name_token),
-      m_tok_info (meth, cls), m_orig_text ()
+  token (int tv, const std::string& meth, const std::string& cls, const filepos& beg_pos, const filepos& end_pos)
+    : m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (scls_name_token), m_tok_info (meth, cls)
   { }
 
   OCTAVE_DEFAULT_COPY_MOVE_DELETE (token)
@@ -159,16 +141,16 @@
 
 private:
 
-  bool m_maybe_cmd;
+  bool m_maybe_cmd {false};
 
-  bool m_tspc;
+  bool m_tspc {false};
 
   filepos m_beg_pos;
   filepos m_end_pos;
 
   int m_tok_val;
 
-  token_type m_type_tag;
+  token_type m_type_tag {generic_token};
 
   class superclass_info
   {