use enum name as constant prefix

cl-protobufs.asd

@@ -81,6 +81,8 @@ and functionality for working with them."
       :proto-pathname "google/protobuf/any.proto")
      (:protobuf-source-file "source_context"
       :proto-pathname "google/protobuf/source_context.proto")
+     (:protobuf-source-file "descriptor"
+      :proto-pathname "google/protobuf/descriptor.proto")
      #-ccl
      (:protobuf-source-file "type"
       :proto-pathname "google/protobuf/type.proto"

define-proto.lisp

@@ -292,11 +292,13 @@ message, and of +<value_name>+ when the enum is defined at top-level."
   (let* ((enum-name (symbol-name type))
          (dot (position #\. enum-name :test #'char= :from-end t))
          ;; Use C/C++ enum scope.
-         (scope (and dot (subseq enum-name 0 dot)))
+         (scope enum-name
+                ;; (and dot (subseq enum-name 0 dot))
+                )
          (constants
-          (loop for v in enum-values
-                for c = (fintern "+~@[~A.~]~A+" scope (enum-value-descriptor-name v))
-                collect `(defconstant ,c ,(enum-value-descriptor-value v)))))
+           (loop for v in enum-values
+                 for c = (fintern "+~@[~A.~]~A+" scope (enum-value-descriptor-name v))
+                 collect `(defconstant ,c ,(enum-value-descriptor-value v)))))
     `(progn
        ,@constants
        (export ',(mapcar #'second constants)))))

tests/enum-mapping-test.lisp

@@ -45,10 +45,10 @@ Parameters
   (assert-true (eq :zaphod (pb:my-message.my-enum-int-to-keyword 42)))
 
   ;; constants
-  (assert-eql 1 pb:+my-message.foo+)
-  (assert-eql 2 pb:+my-message.bar+)
-  (assert-eql 2 pb:+my-message.baz+)
-  (assert-eql 42 pb:+my-message.zaphod+)
+  (assert-eql 1 pb:+my-message.my-enum.foo+)
+  (assert-eql 2 pb:+my-message.my-enum.bar+)
+  (assert-eql 2 pb:+my-message.my-enum.baz+)
+  (assert-eql 42 pb:+my-message.my-enum.zaphod+)
 
   ;; Error cases.
   (assert-false (pb:my-message.my-enum-int-to-keyword 1234))
@@ -68,10 +68,10 @@ Parameters
   (assert-eq :zaphod (pb:outer-enum-int-to-keyword 142))
 
   ;; constants
-  (assert-eql 11 pb:+foo+)
-  (assert-eql 12 pb:+bar+)
-  (assert-eql 12 pb:+baz+)
-  (assert-eql 142 pb:+zaphod+)
+  (assert-eql 11 pb:+outer-enum.foo+)
+  (assert-eql 12 pb:+outer-enum.bar+)
+  (assert-eql 12 pb:+outer-enum.baz+)
+  (assert-eql 142 pb:+outer-enum.zaphod+)
 
   ;; Error cases.
   (assert-false (pb:outer-enum-int-to-keyword 1234))