chore: translate constants

Author: Oscar-SR

tests.lsp

@@ -26,14 +26,14 @@
 ;;;; =====================================================
 
 (test equal-atoms
-  (is (equalp (unificar 'a 'a) :NADA))
+  (is (equalp (unificar 'a 'a) :EMPTY))
   ;; Nuevo: (unificar 'f 'f)
-  (is (equalp (unificar 'f 'f) :NADA)))
+  (is (equalp (unificar 'f 'f) :EMPTY)))
 
 (test different-atoms
-  (is (equalp (unificar 'a 'b) :FALLO))
+  (is (equalp (unificar 'a 'b) :FAIL))
   ;; Nuevo: (unificar 'A 'B)
-  (is (equalp (unificar 'A 'B) :FALLO)))
+  (is (equalp (unificar 'A 'B) :FAIL)))
 
 ;;;; =====================================================
 ;;;; Variable with constant
@@ -61,19 +61,19 @@
 ;;;; =====================================================
 
 (test occurs-check
-  (is (equalp (unificar '(? x) '(f (? x))) :FALLO))
+  (is (equalp (unificar '(? x) '(f (? x))) :FAIL))
   ;; Nuevo: (unificar '(? x) '(g (? x)))
-  (is (equalp (unificar '(? x) '(g (? x))) :FALLO)))
+  (is (equalp (unificar '(? x) '(g (? x))) :FAIL)))
 
 ;;;; =====================================================
 ;;;; Simple structures
 ;;;; =====================================================
 
 (test identical-structure
-  (is (equalp (unificar '(f a) '(f a)) :NADA)))
+  (is (equalp (unificar '(f a) '(f a)) :EMPTY)))
 
 (test different-function-symbol
-  (is (equalp (unificar '(f a) '(g a)) :FALLO)))
+  (is (equalp (unificar '(f a) '(g a)) :FAIL)))
 
 ;;;; =====================================================
 ;;;; Structure containing variable(s)
@@ -109,7 +109,7 @@
 
 (test variable-variable
   (is (not (equalp (unificar '(? x) '(? y))
-                   :FALLO))))
+                   :FAIL))))
 
 ;;;; =====================================================
 ;;;; Run test suite

unification.lsp

@@ -25,7 +25,7 @@
 
 (defun formarSustitucion (e1 e2)
 	(if (equalp e1 e2)
-		:NADA
+		:EMPTY
 		(list '/ e1 e2)
 	))
 
@@ -43,7 +43,7 @@
 	))
 
 (defun aplicarSustitucion (s p)
-	(cond ((equalp s :NADA) p)
+	(cond ((equalp s :EMPTY) p)
 		((null p) '())
 		(T (sustituir s p))
 	))
@@ -58,9 +58,9 @@
     ;; SOLUCIÓN: Declaramos las variables locales s1s2, noAparecen y saltar con un LET
     (let (s1s2 noAparecen saltar)
         (cond
-            ((and (equalp s1 :NADA) (equalp s2 :NADA)) :NADA)
-            ((equalp s1 :NADA) s2)
-            ((equalp s2 :NADA) s1)
+            ((and (equalp s1 :EMPTY) (equalp s2 :EMPTY)) :EMPTY)
+            ((equalp s1 :EMPTY) s2)
+            ((equalp s2 :EMPTY) s1)
             (t 
                 (if (equalp (first s1) '/)
                     (setf s1 (list s1)))
@@ -98,32 +98,32 @@
 				(setf e2 temp)
 			)
 			(if (equalp e1 e2)
-				(return-from unificar :NADA)
+				(return-from unificar :EMPTY)
 			)
 			(if (esVariable e1)
 				(if (aparece e1 e2)
-					(return-from unificar :FALLO)
+					(return-from unificar :FAIL)
 					(return-from unificar (formarSustitucion e2 e1))
 				)
 			)
 			(if (esVariable e2)
 				(return-from unificar (formarSustitucion e1 e2))
-				(return-from unificar :FALLO)
+				(return-from unificar :FAIL)
 			)
 		)
 		(setf f1 (first e1))
 		(setf t1 (rest e1))
 		(setf f2 (first e2))
 		(setf t2 (rest e2))
 		(setf z1 (unificar f1 f2))
-		(if(equalp z1 :FALLO)
-			(return-from unificar :FALLO)
+		(if(equalp z1 :FAIL)
+			(return-from unificar :FAIL)
 		)
 		(setf g1 (aplicarSustitucion z1 t1))
 		(setf g2 (aplicarSustitucion z1 t2)) 
 		(setf z2 (unificar g1 g2))
-		(if (equalp z2 :FALLO)
-			(return-from unificar :FALLO)
+		(if (equalp z2 :FAIL)
+			(return-from unificar :FAIL)
 		)
 		(return-from unificar (componer z1 z2))
 	))