* boot/tokens.boot: makeSymbol is not a builtin function.

	* boot/ast.boot: Use makeSymbol in place of INTERN.
	* boot/parser.boot: Likewise.
	* boot/scanner.boot: Likewise.
	* boot/translator.boot: Likewise.
	* interp/alql.boot: Likewise.
	* interp/as.boot: Likewise.
	* interp/ax.boot: Likewise.
	* interp/bc-matrix.boot: Likewise.
	* interp/bc-solve.boot: Likewise.
	* interp/br-con.boot: Likewise.
	* interp/br-data.boot: Likewise.
	* interp/br-op2.boot: Likewise.
	* interp/br-prof.boot: Likewise.
	* interp/br-search.boot: Likewise.
	* interp/c-doc.boot: Likewise.
	* interp/c-util.boot: Likewise.
	* interp/clam.boot: Likewise.
	* interp/compiler.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/format.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/i-spec1.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/i-coerce.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/ht-util.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/pspad1.boot: Likewise.
	* interp/pspad2.boot: Likewise.
	* interp/postpar.boot: Likewise.
	* interp/pf2sex.boot: Likewise.
	* interp/parse.boot: Likewise.
	* interp/packtran.boot: Likewise.
	* interp/nrunopt.boot: Likewise.
	* interp/nruncomp.boot: Likewise.
	* interp/newfort.boot: Likewise.
	* interp/msgdb.boot: Likewise.
	* interp/modemap.boot: Likewise.
	* interp/mark.boot: Likewise.
	* interp/intfile.boot: Likewise.
	* interp/interop.boot: Likewise.
	* interp/incl.boot: Likewise.
	* interp/word.boot: Likewise.
	* interp/wi2.boot: Likewise.
	* interp/wi1.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/topics.boot: Likewise.
	* interp/sys-constants.boot: Likewise.
	* interp/showimp.boot: Likewise.
	* interp/scan.boot: Likewise.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 42c6ba4d..7f47e5a5 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- Copyright (C) 2007-2011, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -107,7 +107,7 @@ writeCFile(name,args,fortranArgs,dummies,decls,results,returnType,asps,fp) ==
     routineName := name
   -- If it is a function then give it somewhere to stick its result:
   if returnType then
-    returnName := INTERN strconc(name,'"__result")
+    returnName := makeSymbol strconc(name,'"__result")
     wl(['"    ",getCType returnType,'" ",returnName,'",",routineName,'"();"],fp)
   -- print out type declarations for the Fortran parameters, and build an
   -- ordered list of pairs [<parameter> , <type>]
@@ -300,18 +300,18 @@ makeSpadFun(name,userArgs,args,dummies,decls,results,returnType,asps,aspInfo,
 
   -- To make sure the spad interpreter isn't confused:
   if returnType then
-    returnName := INTERN strconc(name,'"Result")
+    returnName := makeSymbol strconc(name,'"Result")
     decls := [[returnType,returnName], :decls]
     results := [returnName, :results]
-  argNames := [INTERN strconc(STRINGIMAGE(u),'"__arg") for u in userArgs]
+  argNames := [makeSymbol strconc(STRINGIMAGE(u),'"__arg") for u in userArgs]
   aType := [axiomType(a,decls,asps,aspInfo) for a in userArgs]
   aspTypes := [second NTH(POSITION(u,userArgs),aType) for u in asps]
   nilLst := MAKE_-LIST(#args+1)
   decPar := [["$elt","Lisp","construct"],:makeLispList decls]
-  fargNames := [INTERN strconc(STRINGIMAGE(u),'"__arg") for u in args |
+  fargNames := [makeSymbol strconc(STRINGIMAGE(u),'"__arg") for u in args |
                  not (MEMQ(u,dummies) or MEMQ(u,asps)) ]
   for u in asps repeat
-    fargNames := delete(INTERN strconc(STRINGIMAGE(u),'"__arg"),fargNames)
+    fargNames := delete(makeSymbol strconc(STRINGIMAGE(u),'"__arg"),fargNames)
   resPar := ["construct",["@",["construct",:fargNames],_
              ["List",["Any"]]]]
   call := [["$elt","Lisp","invokeFortran"],strconc(file,'".spadexe"),_
@@ -363,7 +363,7 @@ makeAspGenerators(asps,types,aspId) ==
 makeAspGenerators1(asp,type,aspId) ==
   [[["$elt","FOP","pushFortranOutputStack"] ,_
     ["filename",'"",strconc(STRINGIMAGE asp,aspId),'"f"]] , _
-   makeOutputAsFortran INTERN strconc(STRINGIMAGE(asp),'"__arg"), _
+   makeOutputAsFortran makeSymbol strconc(STRINGIMAGE(asp),'"__arg"), _
    [["$elt","FOP","popFortranOutputStack"]]   _
   ]