Merge branch 'master' of git://common-lisp.net/projects/qitab/cl-protobufs

Conflicts:
	tests/qtest.lisp

diff --cc model-classes.lisp
Simple merge

diff --cc parser.lisp
Simple merge

diff --cc tests/qtest.lisp
index 414fc83,7b23449..0259e45
--- 1/tests/qtest.lisp
--- 2/tests/qtest.lisp
+++ b/tests/qtest.lisp
@@@ -46,10 -46,10 +46,10 @@@
      (format t "~&Running test ~A" test)
      (funcall test)))
  
- (defmacro assert-equal (actual expected &key (test 'equal))
-   `(unless (,test ,actual ,expected)
+ (defmacro assert-equal (actual expected &key (test '#'equal))
+   `(unless (funcall ,test ,actual ,expected)
 -     (warn "The value ~S is not equal to the expected value ~S"
 -           ',actual ',expected)))
 +     (warn "The value of ~S (~S) is not equal to the expected value ~S"
 +           ',actual ,actual ,expected)))
  
  (defmacro assert-true (form)
    `(unless ,form

diff --cc utilities.lisp
Simple merge