Index: /branches/tfe/ccl/compiler/tfe/tgen.lisp
===================================================================
--- /branches/tfe/ccl/compiler/tfe/tgen.lisp	(revision 6560)
+++ /branches/tfe/ccl/compiler/tfe/tgen.lisp	(revision 6561)
@@ -3,9 +3,9 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (require "NXENV")
-  (require "TATTR")
-  (require "TNODE")
-  (require "GLOBALFN")
-  (require "TPRIM")
-  (require "TENV"))
+  (require "TATTR" "ccl:compiler;tfe;tattr")
+  (require "TNODE" "ccl:compiler;tfe;tnode")
+  (require "GLOBALFN" "ccl:compiler;tfe;globalfn")
+  (require "TPRIM" "ccl:compiler;tfe;tprim")
+  (require "TENV" "ccl:compiler;tfe;tenv"))
 
 (defun tgen-warn (condition &rest args)
@@ -434,5 +434,5 @@
 (deftgen tgen-function function (tconn arg &environment env)
   (multiple-value-bind (valid name) (valid-function-name-p arg)
-    (if (valid-function-name-p arg)
+    (if valid
       (multiple-value-bind (info local) (function-information arg env)
         (case info
@@ -441,4 +441,9 @@
           (t
            (if local
+             (setf (tconn-child tconn)
+                   (make-tlocalfuncref :parent tconn :leaf local))
+             (setf (tconn-child tconn)
+                   (make-tgfuncnameref :parent tconn :leaf name)))))))))
+