# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1424883841 18000
# Node ID 734a77207e2e0ccd51157ffe7293b101b71eb949
# Parent  bf511802add76eb8828d1dca4aedfeb3092c960b# Parent  77f65eabac201738879c599880e458576c2dc734
maint: Periodic merge of stable to default.

diff -r bf511802add7 -r 734a77207e2e libinterp/parse-tree/lex.ll
--- a/libinterp/parse-tree/lex.ll	Tue Feb 24 21:38:21 2015 -0800
+++ b/libinterp/parse-tree/lex.ll	Wed Feb 25 12:04:01 2015 -0500
@@ -2594,8 +2594,7 @@
             if ((reading_fcn_file || reading_script_file
                  || reading_classdef_file)
                 && ! fcn_file_full_name.empty ())
-              tok_val = new token (magic_file_kw, true,
-                                   fcn_file_full_name, l, c);
+              tok_val = new token (magic_file_kw, fcn_file_full_name, l, c);
             else
               tok_val = new token (magic_file_kw, "stdin", l, c);
           }
diff -r bf511802add7 -r 734a77207e2e libinterp/parse-tree/token.cc
--- a/libinterp/parse-tree/token.cc	Tue Feb 24 21:38:21 2015 -0800
+++ b/libinterp/parse-tree/token.cc	Wed Feb 25 12:04:01 2015 -0500
@@ -52,6 +52,17 @@
   type_tag = is_kw ? keyword_token : generic_token;
 }
 
+token::token (int tv, const char *s, int l, int c)
+{
+  maybe_cmd = false;
+  tspc = false;
+  line_num = l;
+  column_num = c;
+  tok_val = tv;
+  type_tag = string_token;
+  str = new std::string (s);
+}
+
 token::token (int tv, const std::string& s, int l, int c)
 {
   maybe_cmd = false;
diff -r bf511802add7 -r 734a77207e2e libinterp/parse-tree/token.h
--- a/libinterp/parse-tree/token.h	Tue Feb 24 21:38:21 2015 -0800
+++ b/libinterp/parse-tree/token.h	Wed Feb 25 12:04:01 2015 -0500
@@ -63,6 +63,7 @@
 
   token (int tv, int l = -1, int c = -1);
   token (int tv, bool is_keyword, int l = -1, int c = -1);
+  token (int tv, const char *s, int l = -1, int c = -1);
   token (int tv, const std::string& s, int l = -1, int c = -1);
   token (int tv, double d, const std::string& s = std::string (),
          int l = -1, int c = -1);