Rename global expressions to global initializers.

takagi · Dec 17, 2016 · 886d0d3 · 886d0d3
1 parent 4e8e3f6
commit 886d0d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/lang/kernel.lisp b/src/lang/kernel.lisp
@@ -46,7 +46,7 @@
            :kernel-global-name
            :kernel-global-c-name
            :kernel-global-qualifiers
-           :kernel-global-expression)
+           :kernel-global-initializer)
   ;; Shadow symbols in cl-cuda.lang.syntax.
   (:shadow :macro-p
            :symbol-macro-p
@@ -257,8 +257,8 @@
 (defun kernel-global-qualifiers (kernel name)
   (global-qualifiers (%lookup-global kernel name)))
 
-(defun kernel-global-expression (kernel name)
-  (global-expression (%lookup-global kernel name)))
+(defun kernel-global-initializer (kernel name)
+  (global-initializer (%lookup-global kernel name)))
 
 
 ;;;
@@ -359,9 +359,9 @@
 (defstruct (global (:constructor %make-global))
   (name :name :read-only t)
   (qualifiers :qualifiers :read-only t)
-  (expression :expression :read-only t))
+  (initializer :initializer :read-only t))
 
-(defun make-global (name qualifiers expression)
+(defun make-global (name qualifiers initializer)
   (let ((qualifiers1 (ensure-list qualifiers)))
     ;; Check type of name.
     (check-type name cl-cuda-symbol)
@@ -371,7 +371,7 @@
     ;; Make global.
     (%make-global :name name
                   :qualifiers qualifiers1
-                  :expression expression)))
+                  :initializer initializer)))
 
 (defun global-c-name (global)
   (c-identifier (global-name global) t))
diff --git a/t/lang/kernel.lisp b/t/lang/kernel.lisp
@@ -323,7 +323,7 @@
         "cl_cuda_test_lang_kernel_foo")
     (is (kernel-global-qualifiers kernel 'foo)
         '(:device))
-    (is (kernel-global-expression kernel 'foo)
+    (is (kernel-global-initializer kernel 'foo)
         42))
 
   (let ((kernel (make-kernel)))
@@ -439,24 +439,24 @@
               type-error
               "Invalid name.")))
 
-(subtest "kernel-global-expression"
+(subtest "kernel-global-initializer"
 
   (let ((kernel (make-kernel)))
     (kernel-define-global kernel 'foo :device 42)
-    (is (kernel-global-expression kernel 'foo)
+    (is (kernel-global-initializer kernel 'foo)
         42))
 
   (let ((kernel (make-kernel)))
-    (is-error (kernel-global-expression kernel 'foo)
+    (is-error (kernel-global-initializer kernel 'foo)
               simple-error
               "Global not found."))
 
-  (is-error (kernel-global-expression :foo 'foo)
+  (is-error (kernel-global-initializer :foo 'foo)
             type-error
             "Invalid kernel.")
 
   (let ((kernel (make-kernel)))
-    (is-error (kernel-global-expression kernel "foo")
+    (is-error (kernel-global-initializer kernel "foo")
               type-error
               "Invalid name.")))