[gfortran] Alphabetize objects in Make-lang.in, move data.o

[Tobias Schlüter <tobias dot schlueter at physik dot uni-muenchen dot de>]

After being repeatedly annoyed by the non-alphabetical order of compiles 
when rebuilding gfortran, I decided to alphabetize the objects in 
Make-lang.in. While doing this, I noticed that data.o is wrongly treated 
as a F95_OBJ, not a F95_PARSER_OBJ. So I moved it to the right place, 
removing the dependency on trans.h (it called gfc_todo_error which is 
declared in trans.h, I replaced this call by gfc_internal_error).

Built on i686-pc-linux. Ok?

- Tobi

Index: Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fortran/Make-lang.in,v
retrieving revision 1.6
diff -u -p -r1.6 Make-lang.in
--- Make-lang.in        15 May 2004 19:02:24 -0000      1.6
+++ Make-lang.in        4 Jun 2004 15:36:36 -0000
@@ -62,20 +62,20 @@ GFORTRAN_CROSS_NAME = `echo gfortran|sed
 # from the parse tree to GENERIC, and F95_ADDITIONAL_OBJS are the files
 # from the middle end we depend on.

-F95_PARSER_OBJS = fortran/arith.o fortran/array.o fortran/bbt.o 
fortran/check.o\
-    fortran/decl.o fortran/error.o fortran/expr.o fortran/interface.o \
-    fortran/intrinsic.o fortran/io.o fortran/iresolve.o fortran/match.o \
-    fortran/matchexp.o fortran/misc.o fortran/module.o fortran/parse.o \
-    fortran/primary.o fortran/options.o fortran/resolve.o \
-    fortran/scanner.o fortran/simplify.o fortran/st.o fortran/symbol.o \
-    fortran/dump-parse-tree.o
+F95_PARSER_OBJS = fortran/arith.o fortran/array.o fortran/bbt.o \
+    fortran/check.o fortran/data.o fortran/decl.o 
fortran/dump-parse-tree.o \
+    fortran/error.o fortran/expr.o fortran/interface.o \
+    fortran/intrinsic.o fortran/io.o fortran/iresolve.o \
+    fortran/match.o fortran/matchexp.o fortran/misc.o fortran/module.o \
+    fortran/options.o fortran/parse.o fortran/primary.o 
fortran/resolve.o \
+    fortran/scanner.o fortran/simplify.o fortran/st.o fortran/symbol.o

 F95_OBJS = $(F95_PARSER_OBJS) \
-    fortran/f95-lang.o fortran/convert.o fortran/trans.o 
fortran/trans-decl.o \-    fortran/trans-types.o fortran/trans-const.o 
fortran/trans-expr.o \
-    fortran/trans-stmt.o fortran/trans-io.o fortran/trans-array.o \
-    fortran/trans-intrinsic.o fortran/dependency.o fortran/trans-common.o \
-    fortran/data.o
+    fortran/convert.o fortran/dependency.o fortran/f95-lang.o \
+    fortran/trans.o fortran/trans-array.o fortran/trans-common.o \
+    fortran/trans-const.o fortran/trans-decl.o fortran/trans-expr.o \
+    fortran/trans-intrinsic.o fortran/trans-io.o fortran/trans-stmt.o \
+    fortran/trans-types.o

 # FIXME:
 # We rely on c-semantics to expand from GIMPLE to RTL.
@@ -278,5 +278,4 @@ fortran/trans-intrinsic.o: $(GFORTRAN_TR
   gt-fortran-trans-intrinsic.h
 fortran/dependency.o: fortran/gfortran.h fortran/dependency.h
 fortran/trans-common.o: $(GFORTRAN_TRANS_DEPS)
-fortran/data.o: $(GFORTRAN_TRANS_DEPS)

Index: data.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fortran/data.c,v
retrieving revision 1.4
diff -u -p -r1.4 data.c
--- data.c      2 Jun 2004 11:38:24 -0000       1.4
+++ data.c      4 Jun 2004 15:36:37 -0000
@@ -34,12 +34,8 @@ Software Foundation, 59 Temple Place - S
    trans-array.c.  */

 #include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "toplev.h"
 #include "gfortran.h"
 #include "assert.h"
-#include "trans.h"

 static void formalize_init_expr (gfc_expr *);

@@ -527,7 +523,7 @@ gfc_get_section_index (gfc_array_ref *ar
          break;

        case DIMEN_VECTOR:
-         gfc_todo_error ("Vectors sections in data statements");
+         gfc_internal_error ("TODO: Vector sections in data statements");

        default:
          abort ();