Re: 2.1.69 and gcc 4.0

[John W. Eaton]

On  4-May-2005, Dmitri A. Sergatskov wrote:

| Quentin Spencer wrote:
| ...
| > Thanks for clarifying. I tried 2.9.2, and it builds fine and everything 
| > appears to work (I'm using the 4.0.0-2 gcc release from Fedora for the 
| > test version of Fedora Core 4). 2.1.69 still fails (on lex.cc). Should 
| 
| Cool. So the fix for ENTRY bug did indeed make it into rpms...
| 
| > that be considered a bug in the compiler or in octave?
| 
| I do not know. I guess it is up to John if he wants to backport the changes to
| 2.1.x tree...

Yes, for the most part, I will be trying to fix serious bugs in the
2.1.x series until the 2.9.x branch seems reliable enough to become
the recommended version.

But patching both the 2.1.x and 2.9.x branches takes more time than
working on 2.9.x only, so I have to choose carefully.  OR, someone
else has to come forward and volunteer to maintain the 2.1.x branch
and apply selected bug fixes to it and test it and make snapshots,
etc.

Anyway, please try the following patch for the lex.cc problem.

Thanks,

jwe


src/ChangeLog:

2005-05-05  John W. Eaton  <address@hidden>

        * lex.l (class bracket_brace_paren_nesting_level): Use static
        const int members instead of anonymous enum.


Index: src/lex.l
===================================================================
RCS file: /usr/local/cvsroot/octave/src/lex.l,v
retrieving revision 1.217.2.6
diff -u -r1.217.2.6 lex.l
--- src/lex.l   26 Apr 2005 19:43:58 -0000      1.217.2.6
+++ src/lex.l   5 May 2005 14:05:57 -0000
@@ -218,7 +218,9 @@
 
   std::stack<int> context;
 
-  enum { BRACKET = 1, BRACE = 2, PAREN = 3 };
+  static const int BRACKET;
+  static const int BRACE;
+  static const int PAREN;
 
   bracket_brace_paren_nesting_level (const bracket_brace_paren_nesting_level&);
 
@@ -226,6 +228,10 @@
   operator = (const bracket_brace_paren_nesting_level&);
 };
 
+const int bracket_brace_paren_nesting_level::BRACKET = 1;
+const int bracket_brace_paren_nesting_level::BRACE = 2;
+const int bracket_brace_paren_nesting_level::PAREN = 3;
+
 static bracket_brace_paren_nesting_level nesting_level;
 
 static bool Vwarn_matlab_incompatible = false;



-------------------------------------------------------------
Octave is freely available under the terms of the GNU GPL.

Octave's home on the web:  http://www.octave.org
How to fund new projects:  http://www.octave.org/funding.html
Subscription information:  http://www.octave.org/archive.html
-------------------------------------------------------------