Adjusted tests/abstract-sem-tree-generator unit-tests

TheStalkerDen · TheStalkerDen · commit 254a736ad9f7 · 2021-04-26T20:30:25.000+03:00
diff --git a/DiffBackend/tests/abstract-sem-tree-generator.lisp b/DiffBackend/tests/abstract-sem-tree-generator.lisp
@@ -15,7 +15,8 @@
                  "1"
                  1
                  1
-                 :integer))))
+                 :integer
+                 :id 1))))
 
 (def-ast-test funcall.1
     "(fun)"
@@ -28,7 +29,8 @@
                               "fun"
                               1
                               2
-                              :symbol))
+                              :symbol
+                              :id 2))
     :parenthesis-info `((:lparen-coord 1 1)
                         (:rparen-coord 1 5))
     :func-arg-forms ())))
@@ -44,7 +46,8 @@
                               "fun"
                               1
                               2
-                              :symbol))
+                              :symbol
+                              :id 2))
     :parenthesis-info `((:lparen-coord 1 1)
                         (:rparen-coord 1 7))
     :func-arg-forms `(,(make-instance
@@ -54,7 +57,8 @@
                          "1"
                          1
                          6
-                         :integer))))))
+                         :integer
+                         :id 3))))))
 
 (def-ast-test defun.1
     "(defun a () 1)"
@@ -67,14 +71,16 @@
                              "a"
                              1
                              8
-                             :symbol))
+                             :symbol
+                             :id 3))
     :keyword-lexem (make-instance
                     'lexem-wrapper-node
                     :lexem-info (make-lexem
                                  "defun"
                                  1
                                  2
-                                 :symbol))
+                                 :symbol
+                                 :id 2))
     :parenthesis-info `((:lparen-coord 1 1)
                         (:rparen-coord 1 14))
     :parameters-list (make-instance
@@ -88,7 +94,8 @@
                                  "1"
                                  1
                                  13
-                                 :integer))))))
+                                 :integer
+                                 :id 6))))))
 
 (def-ast-test defun.2
     "(defun a (b) b)"
@@ -101,14 +108,16 @@
                              "a"
                              1
                              8
-                             :symbol))
+                             :symbol
+                             :id 3))
     :keyword-lexem (make-instance
                     'lexem-wrapper-node
                     :lexem-info (make-lexem
                                  "defun"
                                  1
                                  2
-                                 :symbol))
+                                 :symbol
+                                 :id 2))
     :parenthesis-info `((:lparen-coord 1 1)
                         (:rparen-coord 1 15))
     :parameters-list (make-instance
@@ -121,14 +130,16 @@
                                                  "b"
                                                  1
                                                  11
-                                                 :symbol))))
+                                                 :symbol
+                                                 :id 5))))
     :body-forms `(,(make-instance
                     'lexem-wrapper-node
                     :lexem-info (make-lexem
                                  "b"
                                  1
                                  14
-                                 :symbol))))))
+                                 :symbol
+                                 :id 7))))))
 
 (def-ast-test defun.3
     "(defun a (b) (f b 1))"
@@ -141,14 +152,16 @@
                              "a"
                              1
                              8
-                             :symbol))
+                             :symbol
+                             :id 3))
     :keyword-lexem (make-instance
                     'lexem-wrapper-node
                     :lexem-info (make-lexem
                                  "defun"
                                  1
                                  2
-                                 :symbol))
+                                 :symbol
+                                 :id 2))
     :parenthesis-info `((:lparen-coord 1 1)
                         (:rparen-coord 1 21))
     :parameters-list (make-instance
@@ -161,7 +174,8 @@
                                                  "b"
                                                  1
                                                  11
-                                                 :symbol))))
+                                                 :symbol
+                                                 :id 5))))
     :body-forms `(,(make-instance
                     'function-call-node
                     :func-lexem (make-instance
@@ -170,7 +184,8 @@
                                               "f"
                                               1
                                               15
-                                              :symbol))
+                                              :symbol
+                                              :id 8))
                     :parenthesis-info `((:lparen-coord 1 14)
                                         (:rparen-coord 1 20))
                     :func-arg-forms `(
@@ -180,11 +195,13 @@
                                                     "b"
                                                     1
                                                     17
-                                                    :symbol))
+                                                    :symbol
+                                                    :id 9))
                                        ,(make-instance
                                          'lexem-wrapper-node
                                          :lexem-info (make-lexem
                                                       "1"
                                                       1
                                                       19
-                                                      :integer))))))))
+                                                      :integer
+                                                      :id 10))))))))

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`"1"`
`16`	`16`	`1`
`17`	`17`	`1`
`18`		`- :integer))))`
	`18`	`+ :integer`
	`19`	`+ :id 1))))`
`19`	`20`
`20`	`21`	`(def-ast-test funcall.1`
`21`	`22`	`"(fun)"`
`@@ -28,7 +29,8 @@`
`28`	`29`	`"fun"`
`29`	`30`	`1`
`30`	`31`	`2`
`31`		`- :symbol))`
	`32`	`+ :symbol`
	`33`	`+ :id 2))`
`32`	`34`	:parenthesis-info `((:lparen-coord 1 1)
`33`	`35`	`(:rparen-coord 1 5))`
`34`	`36`	`:func-arg-forms ())))`
`@@ -44,7 +46,8 @@`
`44`	`46`	`"fun"`
`45`	`47`	`1`
`46`	`48`	`2`
`47`		`- :symbol))`
	`49`	`+ :symbol`
	`50`	`+ :id 2))`
`48`	`51`	:parenthesis-info `((:lparen-coord 1 1)
`49`	`52`	`(:rparen-coord 1 7))`
`50`	`53`	:func-arg-forms `(,(make-instance
`@@ -54,7 +57,8 @@`
`54`	`57`	`"1"`
`55`	`58`	`1`
`56`	`59`	`6`
`57`		`- :integer))))))`
	`60`	`+ :integer`
	`61`	`+ :id 3))))))`
`58`	`62`
`59`	`63`	`(def-ast-test defun.1`
`60`	`64`	`"(defun a () 1)"`
`@@ -67,14 +71,16 @@`
`67`	`71`	`"a"`
`68`	`72`	`1`
`69`	`73`	`8`
`70`		`- :symbol))`
	`74`	`+ :symbol`
	`75`	`+ :id 3))`
`71`	`76`	`:keyword-lexem (make-instance`
`72`	`77`	`'lexem-wrapper-node`
`73`	`78`	`:lexem-info (make-lexem`
`74`	`79`	`"defun"`
`75`	`80`	`1`
`76`	`81`	`2`
`77`		`- :symbol))`
	`82`	`+ :symbol`
	`83`	`+ :id 2))`
`78`	`84`	:parenthesis-info `((:lparen-coord 1 1)
`79`	`85`	`(:rparen-coord 1 14))`
`80`	`86`	`:parameters-list (make-instance`
`@@ -88,7 +94,8 @@`
`88`	`94`	`"1"`
`89`	`95`	`1`
`90`	`96`	`13`
`91`		`- :integer))))))`
	`97`	`+ :integer`
	`98`	`+ :id 6))))))`
`92`	`99`
`93`	`100`	`(def-ast-test defun.2`
`94`	`101`	`"(defun a (b) b)"`
`@@ -101,14 +108,16 @@`
`101`	`108`	`"a"`
`102`	`109`	`1`
`103`	`110`	`8`
`104`		`- :symbol))`
	`111`	`+ :symbol`
	`112`	`+ :id 3))`
`105`	`113`	`:keyword-lexem (make-instance`
`106`	`114`	`'lexem-wrapper-node`
`107`	`115`	`:lexem-info (make-lexem`
`108`	`116`	`"defun"`
`109`	`117`	`1`
`110`	`118`	`2`
`111`		`- :symbol))`
	`119`	`+ :symbol`
	`120`	`+ :id 2))`
`112`	`121`	:parenthesis-info `((:lparen-coord 1 1)
`113`	`122`	`(:rparen-coord 1 15))`
`114`	`123`	`:parameters-list (make-instance`
`@@ -121,14 +130,16 @@`
`121`	`130`	`"b"`
`122`	`131`	`1`
`123`	`132`	`11`
`124`		`- :symbol))))`
	`133`	`+ :symbol`
	`134`	`+ :id 5))))`
`125`	`135`	:body-forms `(,(make-instance
`126`	`136`	`'lexem-wrapper-node`
`127`	`137`	`:lexem-info (make-lexem`
`128`	`138`	`"b"`
`129`	`139`	`1`
`130`	`140`	`14`
`131`		`- :symbol))))))`
	`141`	`+ :symbol`
	`142`	`+ :id 7))))))`
`132`	`143`
`133`	`144`	`(def-ast-test defun.3`
`134`	`145`	`"(defun a (b) (f b 1))"`
`@@ -141,14 +152,16 @@`
`141`	`152`	`"a"`
`142`	`153`	`1`
`143`	`154`	`8`
`144`		`- :symbol))`
	`155`	`+ :symbol`
	`156`	`+ :id 3))`
`145`	`157`	`:keyword-lexem (make-instance`
`146`	`158`	`'lexem-wrapper-node`
`147`	`159`	`:lexem-info (make-lexem`
`148`	`160`	`"defun"`
`149`	`161`	`1`
`150`	`162`	`2`
`151`		`- :symbol))`
	`163`	`+ :symbol`
	`164`	`+ :id 2))`
`152`	`165`	:parenthesis-info `((:lparen-coord 1 1)
`153`	`166`	`(:rparen-coord 1 21))`
`154`	`167`	`:parameters-list (make-instance`
`@@ -161,7 +174,8 @@`
`161`	`174`	`"b"`
`162`	`175`	`1`
`163`	`176`	`11`
`164`		`- :symbol))))`
	`177`	`+ :symbol`
	`178`	`+ :id 5))))`
`165`	`179`	:body-forms `(,(make-instance
`166`	`180`	`'function-call-node`
`167`	`181`	`:func-lexem (make-instance`
`@@ -170,7 +184,8 @@`
`170`	`184`	`"f"`
`171`	`185`	`1`
`172`	`186`	`15`
`173`		`- :symbol))`
	`187`	`+ :symbol`
	`188`	`+ :id 8))`
`174`	`189`	:parenthesis-info `((:lparen-coord 1 14)
`175`	`190`	`(:rparen-coord 1 20))`
`176`	`191`	:func-arg-forms `(
`@@ -180,11 +195,13 @@`
`180`	`195`	`"b"`
`181`	`196`	`1`
`182`	`197`	`17`
`183`		`- :symbol))`
	`198`	`+ :symbol`
	`199`	`+ :id 9))`
`184`	`200`	`,(make-instance`
`185`	`201`	`'lexem-wrapper-node`
`186`	`202`	`:lexem-info (make-lexem`
`187`	`203`	`"1"`
`188`	`204`	`1`
`189`	`205`	`19`
`190`		`- :integer))))))))`
	`206`	`+ :integer`
	`207`	`+ :id 10))))))))`