element* in ast-gen is now vector, no list

Author: TheStalkerDen

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

@@ -36,6 +36,10 @@
 (defun is-atom-s-expr? (s-expr)
   (eq (first s-expr) :atom))
 
+(defun get-form*-vector (form*-list)
+  (when form*-list
+    (map 'vector #'match-s-expr form*-list)))
+
 (defun make-lexem-wrapper (lexem)
   (make-instance 'lexem-wrapper-node :lexem-info lexem))
 
@@ -54,9 +58,7 @@
                 :func-name (make-lexem-wrapper (third name))
                 :parenthesis-info par-info
                 :parameters-list (gen-list-node parms)
-                :body-forms (mapcar (lambda (form)
-                                      (match-s-expr form))
-                                    forms))))
+                :body-forms (get-form*-vector forms))))
           (add-to-stats (lexem-string (third name))
                         res-obj
                         :stat-name :defuns
@@ -67,10 +69,7 @@
   (when (eq (first list-element) :list)
     (make-instance 'list-node
                    :parenthesis-info (second list-element)
-                   :elements (mapcar (lambda (el)
-                                       (match-s-expr el))
-                                     (rest
-                                      (rest list-element))))))
+                   :elements (get-form*-vector (rest (rest list-element))))))
 
 (defun match-function-call (list-element)
   (destructuring-bind (type par-info func-form &rest args)
@@ -79,6 +78,4 @@
     (make-instance 'function-call-node
                    :func-lexem (match-s-expr func-form)
                    :parenthesis-info par-info
-                   :func-arg-forms (mapcar (lambda (arg)
-                                             (match-s-expr arg))
-                                           args))))
+                   :func-arg-forms (get-form*-vector args))))

DiffBackend/src/nodes.lisp

@@ -35,7 +35,7 @@
 
 (defgeneric calculate-no-whitespace-length (obj)
   (:method (obj)
-    (print "No no")))
+    (print "Can't calculate no-whitespace-length for obj ~S" obj)))
 
 (defmethod calculate-no-whitespace-length :around ((obj no-whitespace-length-mixin))
   (if (slot-boundp obj 'no-whitespace-length)
@@ -47,6 +47,7 @@
     (unless (slot-boundp obj 'no-whitespace-length)
       (setf no-whitespace-length (calculate-no-whitespace-length obj)))))
 
+;;;LEXEM-WRAPPER-NODE
 (define-node lexem-wrapper-node ()
   ((lexem-info :accessor lexem-info
                :initarg :lexem-info)))
@@ -65,6 +66,7 @@
       (print-unreadable-object (obj stream)
         (format stream "~S" (lexem-string lexem-info)))))
 
+;;;DEFUN-NODE
 (define-node defun-node (parenthesis-mixin keyword-mixin)
   ((function-name :accessor function-name
                   :initarg :func-name)
@@ -83,6 +85,7 @@
          (calculate-no-whitespace-length keyword-lexem)
          2)))
 
+;;;FUNCTION-CALL-NODE
 (define-node function-call-node (parenthesis-mixin)
   ((func-lexem :accessor func-lexem
                :initarg :func-lexem)
@@ -100,16 +103,19 @@
     (print-unreadable-object (obj stream)
       (format stream "Funcall ~S" func-lexem))))
 
+;;;LIST-NODE
 (define-node list-node (parenthesis-mixin)
   ((elements :accessor elements
              :initarg :elements)))
 
 (defmethod calculate-no-whitespace-length ((obj list-node))
   (with-slots (elements) obj
-    (+ 2 (loop :for el :in elements
-         :sum (calculate-no-whitespace-length el)))))
+    (+ 2 (calculate-no-whitespace-length elements))))
 
 (defmethod calculate-no-whitespace-length ((obj list))
   (loop :for el :in obj
-       :sum (calculate-no-whitespace-length el)))
+        :sum (calculate-no-whitespace-length el)))
 
+(defmethod calculate-no-whitespace-length ((obj vector))
+  (loop :for el :across obj
+       :sum (calculate-no-whitespace-length el)))