Mercurial > octave

diff libinterp/octave-value/ov-java.cc @ 23075:4e3d47dc7e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move parse tree classes inside octave namespace * lex.h, lex.ll, oct-parse.in.yy, parse.h, pt-all.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.cc, pt-array-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.cc, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.cc, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-funcall.cc, pt-funcall.h, pt.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.cc, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-stmt.cc, pt-stmt.h, pt-unop.cc, pt-unop.h, pt-walk.h, token.cc, token.h: Move classes and most functions inside octave namespace. Change all uses.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Jan 2017 23:41:54 -0500
parents 50495eeb5df1
children ef4d915df748
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/octave-value/ov-java.cc	Thu Jan 19 23:41:54 2017 -0500
@@ -1819,7 +1819,7 @@
   for (int i = 0; i < nargin; i++)
     varargin(i) = box (env, env->GetObjectArrayElement (argin, i), 0);
 
-  varargout = feval (fname, varargin, nargout);
+  varargout = octave::feval (fname, varargin, nargout);
 
   jobjectArray_ref out_objs (env, argout), out_clss (env);
   out_objs.detach ();
@@ -1855,7 +1855,7 @@
       if (val.is_function_handle ())
         {
           octave_function *fcn = val.function_value ();
-          feval (fcn, oct_args);
+          octave::feval (fcn, oct_args);
         }
       else if (val.is_cell () && val.length () > 0
                && (val.rows () == 1 || val.columns () == 1)
@@ -1867,7 +1867,7 @@
           for (int i=1; i<c.numel (); i++)
             oct_args(len+i-1) = c(i);
 
-          feval (fcn, oct_args);
+          octave::feval (fcn, oct_args);
         }
       else
         error ("trying to invoke non-invocable object");
@@ -1881,7 +1881,7 @@
 {
   std::string s = jstring_to_string (env, cmd);
   int pstatus;
-  eval_string (s, false, pstatus, 0);
+  octave::eval_string (s, false, pstatus, 0);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -1980,7 +1980,7 @@
           ovl(0) = (idx.front ())(0);
           std::list<octave_value_list>::const_iterator it = idx.begin ();
           ovl.append (*++it);
-          retval = feval (std::string ("javaMethod"), ovl, 1);
+          retval = octave::feval (std::string ("javaMethod"), ovl, 1);
           skip++;
         }
       else
@@ -1989,7 +1989,7 @@
           count++;
           ovl(0) = octave_value (this);
           ovl(1) = (idx.front ())(0);
-          retval = feval (std::string ("__java_get__"), ovl, 1);
+          retval = octave::feval (std::string ("__java_get__"), ovl, 1);
         }
       break;
 
@@ -2045,7 +2045,7 @@
           ovl(0) = octave_value (this);
           ovl(1) = (idx.front ())(0);
           ovl(2) = rhs;
-          feval ("__java_set__", ovl, 0);
+          octave::feval ("__java_set__", ovl, 0);
 
           count++;
           retval = octave_value (this);