Mercurial > octave

diff libinterp/corefcn/help.cc @ 23065:7c7a61c2e0ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace out-of-date __keywords__ with alias to iskeyword. * help.cc: Add #include "builtin-defun-decls.h". Sort list of #includes. Remove static variable keywords and keyword_names. * help.cc (make_name_list): New static variable keywords to hold output of Fiskeyword. New static variable key_len to hold number of keywords. * help.cc (F__keywords): Remove DEFUN and replace with DEFALIAS to iskeyword. * file-editor-tab.cc (update_lexer): Call Fiskeyword rather than F__keywords__. * help.m: Replace call to iskeyword with __keywords__.
author Rik <rik@octave.org>
date Tue, 17 Jan 2017 17:42:27 -0800
parents f97e22a9012a
children 4e3d47dc7e25
line wrap: on
line diff
--- a/libinterp/corefcn/help.cc	Tue Jan 17 16:50:39 2017 -0800
+++ b/libinterp/corefcn/help.cc	Tue Jan 17 17:42:27 2017 -0800
@@ -41,32 +41,33 @@
 #include "oct-locbuf.h"
 #include "str-vec.h"
 
+#include "Cell.h"
+#include "builtin-defun-decls.h"
 #include "call-stack.h"
-#include <defaults.h>
-#include "Cell.h"
 #include "defun.h"
 #include "dirfns.h"
 #include "error.h"
 #include "errwarn.h"
 #include "help.h"
 #include "input.h"
+#include "interpreter.h"
 #include "load-path.h"
+#include "ov-fcn-handle.h"
+#include "ov-usr-fcn.h"
 #include "ovl.h"
-#include "ov-usr-fcn.h"
-#include "ov-fcn-handle.h"
 #include "pager.h"
 #include "parse.h"
 #include "pathsearch.h"
 #include "procstream.h"
 #include "pt-pr-code.h"
+#include "quit.h"
 #include "sighandlers.h"
 #include "symtab.h"
-#include "interpreter.h"
 #include "unwind-prot.h"
 #include "utils.h"
 #include "variables.h"
 #include "version.h"
-#include "quit.h"
+#include <defaults.h>
 
 // Name of the doc cache file specified on the command line.
 // (--doc-cache-file file)
@@ -144,46 +145,6 @@
 
 const static string_vector operator_names (operators);
 
-const static char * const keywords[] =
-{
-  "break",
-  "case",
-  "catch",
-  "continue",
-  "do",
-  "else",
-  "elseif",
-  "end",
-  "end_try_catch",
-  "end_unwind_protect",
-  "endfor",
-  "endfunction",
-  "endif",
-  "endparfor",
-  "endswitch",
-  "endwhile",
-  "for",
-  "function",
-  "global",
-  "if",
-  "otherwise",
-  "parfor",
-  "persistent",
-  "return",
-  "static",
-  "switch",
-  "try",
-  "until",
-  "unwind_protect",
-  "unwind_protect_cleanup",
-  "varargin",
-  "varargout",
-  "while",
-  0
-};
-
-const static string_vector keyword_names (keywords);
-
 // Return a vector of all functions from this file,
 // for use in command line auto-completion.
 static string_vector
@@ -219,7 +180,8 @@
 string_vector
 make_name_list (void)
 {
-  const int key_len = keyword_names.numel ();
+  const static string_vector keywords = Fiskeyword ()(0).string_vector_value ();
+  const static int key_len = keywords.numel (); 
 
   const string_vector bif = symbol_table::built_in_function_names ();
   const int bif_len = bif.numel ();
@@ -248,8 +210,9 @@
 
   int j = 0;
   int i = 0;
+
   for (i = 0; i < key_len; i++)
-    list[j++] = keyword_names[i];
+    list[j++] = keywords[i];
 
   for (i = 0; i < bif_len; i++)
     list[j++] = bif[i];
@@ -632,8 +595,7 @@
   return ovl (text, format);
 }
 
-// Return a cell array of strings containing the names of all
-// operators.
+// Return a cell array of strings containing the names of all operators.
 
 DEFUN (__operators__, , ,
        doc: /* -*- texinfo -*-
@@ -644,20 +606,13 @@
   return ovl (Cell (operator_names));
 }
 
-// Return a cell array of strings containing the names of all
-// keywords.
+// Return a cell array of strings containing the names of all keywords.
+// iskeyword() function is located in lex.ll and is based on what the parser
+// thinks is a keyword.
 
-DEFUN (__keywords__, , ,
-       doc: /* -*- texinfo -*-
-@deftypefn {} {} __keywords__ ()
-Undocumented internal function.
-@end deftypefn */)
-{
-  return ovl (Cell (keyword_names));
-}
+DEFALIAS (__keywords__, iskeyword)
 
-// Return a cell array of strings containing the names of all builtin
-// functions.
+// Return a cell array of strings with the names of all builtin functions.
 
 DEFUN (__builtins__, , ,
        doc: /* -*- texinfo -*-