Adjusted abstract-sem-tree-generator

Author: TheStalkerDen

DiffBackend/tests/abstract-sem-tree-generator.lisp

@@ -36,7 +36,7 @@
     :func-arg-forms ())))
 
 (def-ast-test funcall.2
-    "(fun 1)"
+  "(fun 1)"
   (list
    (make-instance
     'function-call-node
@@ -50,18 +50,18 @@
                               :id 2))
     :parenthesis-info `((:lparen-coord 1 1)
                         (:rparen-coord 1 7))
-    :func-arg-forms `(,(make-instance
-                        'lexem-wrapper-node
-                        :lexem-info
-                        (make-lexem
-                         "1"
-                         1
-                         6
-                         :integer
-                         :id 3))))))
+    :func-arg-forms (vector (make-instance
+                             'lexem-wrapper-node
+                             :lexem-info
+                             (make-lexem
+                              "1"
+                              1
+                              6
+                              :integer
+                              :id 3))))))
 
 (def-ast-test defun.1
-    "(defun a () 1)"
+  "(defun a () 1)"
   (list
    (make-instance
     'defun-node
@@ -88,17 +88,18 @@
                       :parenthesis-info `((:lparen-coord 1 10)
                                           (:rparen-coord 1 11))
                       :elements ())
-    :body-forms `(,(make-instance
-                    'lexem-wrapper-node
-                    :lexem-info (make-lexem
-                                 "1"
-                                 1
-                                 13
-                                 :integer
-                                 :id 6))))))
+    :body-forms (vector
+                 (make-instance
+                  'lexem-wrapper-node
+                  :lexem-info (make-lexem
+                               "1"
+                               1
+                               13
+                               :integer
+                               :id 6))))))
 
 (def-ast-test defun.2
-    "(defun a (b) b)"
+  "(defun a (b) b)"
   (list
    (make-instance
     'defun-node
@@ -124,25 +125,25 @@
                       'list-node
                       :parenthesis-info `((:lparen-coord 1 10)
                                           (:rparen-coord 1 12))
-                      :elements `(,(make-instance
-                                    'lexem-wrapper-node
-                                    :lexem-info (make-lexem
-                                                 "b"
-                                                 1
-                                                 11
-                                                 :symbol
-                                                 :id 5))))
-    :body-forms `(,(make-instance
-                    'lexem-wrapper-node
-                    :lexem-info (make-lexem
-                                 "b"
-                                 1
-                                 14
-                                 :symbol
-                                 :id 7))))))
+                      :elements (vector (make-instance
+                                         'lexem-wrapper-node
+                                         :lexem-info (make-lexem
+                                                      "b"
+                                                      1
+                                                      11
+                                                      :symbol
+                                                      :id 5))))
+    :body-forms (vector (make-instance
+                         'lexem-wrapper-node
+                         :lexem-info (make-lexem
+                                      "b"
+                                      1
+                                      14
+                                      :symbol
+                                      :id 7))))))
 
 (def-ast-test defun.3
-    "(defun a (b) (f b 1))"
+  "(defun a (b) (f b 1))"
   (list
    (make-instance
     'defun-node
@@ -168,40 +169,42 @@
                       'list-node
                       :parenthesis-info `((:lparen-coord 1 10)
                                           (:rparen-coord 1 12))
-                      :elements `(,(make-instance
+                      :elements (vector
+                                 (make-instance
+                                  'lexem-wrapper-node
+                                  :lexem-info (make-lexem
+                                               "b"
+                                               1
+                                               11
+                                               :symbol
+                                               :id 5))))
+    :body-forms (vector
+                 (make-instance
+                  'function-call-node
+                  :func-lexem (make-instance
+                               'lexem-wrapper-node
+                               :lexem-info (make-lexem
+                                            "f"
+                                            1
+                                            15
+                                            :symbol
+                                            :id 8))
+                  :parenthesis-info `((:lparen-coord 1 14)
+                                      (:rparen-coord 1 20))
+                  :func-arg-forms (vector
+                                   (make-instance
                                     'lexem-wrapper-node
                                     :lexem-info (make-lexem
                                                  "b"
                                                  1
-                                                 11
+                                                 17
                                                  :symbol
-                                                 :id 5))))
-    :body-forms `(,(make-instance
-                    'function-call-node
-                    :func-lexem (make-instance
-                                 'lexem-wrapper-node
-                                 :lexem-info (make-lexem
-                                              "f"
-                                              1
-                                              15
-                                              :symbol
-                                              :id 8))
-                    :parenthesis-info `((:lparen-coord 1 14)
-                                        (:rparen-coord 1 20))
-                    :func-arg-forms `(
-                                      ,(make-instance
-                                       'lexem-wrapper-node
-                                       :lexem-info (make-lexem
-                                                    "b"
-                                                    1
-                                                    17
-                                                    :symbol
-                                                    :id 9))
-                                       ,(make-instance
-                                         'lexem-wrapper-node
-                                         :lexem-info (make-lexem
-                                                      "1"
-                                                      1
-                                                      19
-                                                      :integer
-                                                      :id 10))))))))
+                                                 :id 9))
+                                   (make-instance
+                                    'lexem-wrapper-node
+                                    :lexem-info (make-lexem
+                                                 "1"
+                                                 1
+                                                 19
+                                                 :integer
+                                                 :id 10))))))))

DiffBackend/tests/test-utils.lisp

@@ -31,6 +31,13 @@
                          (format t "Length ~A : ~A~%" (length obj1) obj1)
                          (format t "Length ~A : ~A~%" (length obj2) obj2)
                          nil)))
+            (vector (if (= (length obj1) (length obj2))
+                       (every #'deep-equal obj1 obj2)
+                       (progn
+                         (format t "Length not equal!~%")
+                         (format t "Length ~A : ~A~%" (length obj1) obj1)
+                         (format t "Length ~A : ~A~%" (length obj2) obj2)
+                         nil)))
             (t (unless (equalp obj1 obj2)
                  (print obj1)
                  (print obj2)