fez-lisp 1.5.91 → 1.5.92

package/src/compiler.js

@@ -268,6 +268,7 @@ const comp = (tree, Drill) => {
       case STATIC_TYPES.UNKNOWN:
       case STATIC_TYPES.ATOM:
       case STATIC_TYPES.PREDICATE:
+      case STATIC_TYPES.ANY:
         return compile(tail[0], Drill)
 
       default: {

package/src/interpreter.js

@@ -837,5 +837,6 @@ export const keywords = {
   [STATIC_TYPES.ATOM]: (args, env) => evaluate(args[0], env),
   [STATIC_TYPES.COLLECTION]: (args, env) => evaluate(args[0], env),
   [STATIC_TYPES.PREDICATE]: (args, env) => evaluate(args[0], env),
-  [STATIC_TYPES.UNKNOWN]: (args, env) => evaluate(args[0], env)
+  [STATIC_TYPES.UNKNOWN]: (args, env) => evaluate(args[0], env),
+  [STATIC_TYPES.ANY]: (args, env) => evaluate(args[0], env)
 }

package/src/keywords.js

@@ -13,7 +13,8 @@ export const STATIC_TYPES = {
   UNKNOWN: 'Unknown',
   ATOM: 'Atom',
   COLLECTION: 'Collection',
-  PREDICATE: 'Predicate'
+  PREDICATE: 'Predicate',
+  ANY: 'Any'
 }
 export const KEYWORDS = {
   LOOP: 'loop',

package/src/types.js

@@ -3,15 +3,17 @@ export const ARG_COUNT = 'argumentsN'
 export const VARIADIC = Infinity
 export const STATS = '__stats__'
 export const ARGUMENTS = 'arguments'
-export const UNKNOWN = -1
 export const RETURNS = 'returns'
 export const SCOPE_NAME = '__scope__'
 export const TYPE_PROP = 'type'
 export const SIGNATURE = 'name'
 export const ORDER = '__order__'
 export const VARIABLE_ORDER_INDEX = 'index'
-export const PREDICATE = 4
+export const UNKNOWN = -1
 export const COLLECTION = 3
+export const PREDICATE = 4
+export const ANY = 5
+
 export const MAX_ARGUMENT_RETRY = 1
 export const MAX_RETRY_DEFINITION = 10
 export const toTypeNames = (type) => {
@@ -21,18 +23,21 @@ export const toTypeNames = (type) => {
     case ATOM:
       return 'Atom'
     case UNKNOWN:
+      // case ANY:
       return 'Unknown'
     case PREDICATE:
       return 'Predicate'
     case COLLECTION:
       return 'Collection'
+    case ANY:
+      return 'Any'
     default:
       break
   }
 }
 export const SPECIAL_FORM_TYPES = {
   [SCOPE_NAME]: ';',
-  [ORDER]: 0,
+  // [ORDER]: 0,
   [toTypeNames(APPLY)]: {
     [STATS]: {
       [TYPE_PROP]: [APPLY],
@@ -301,8 +306,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: 0,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [UNKNOWN],
-            [RETURNS]: [UNKNOWN],
+            [TYPE_PROP]: [ANY],
+            [RETURNS]: [ANY],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
@@ -693,7 +698,7 @@ export const SPECIAL_FORM_TYPES = {
           }
         }
       ],
-      [RETURNS]: [UNKNOWN]
+      [RETURNS]: [ANY]
     }
   },
   [KEYWORDS.SET_ARRAY]: {
@@ -728,8 +733,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: 0,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [UNKNOWN],
-            [RETURNS]: [UNKNOWN],
+            [TYPE_PROP]: [ANY],
+            [RETURNS]: [ANY],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
@@ -805,8 +810,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: 0,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [UNKNOWN],
-            [RETURNS]: [UNKNOWN],
+            [TYPE_PROP]: [ANY],
+            [RETURNS]: [ANY],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
@@ -816,15 +821,15 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: 0,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [UNKNOWN],
-            [RETURNS]: [UNKNOWN],
+            [TYPE_PROP]: [ANY],
+            [RETURNS]: [ANY],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
         }
       ],
-      [RETURNS]: [UNKNOWN]
+      [RETURNS]: [ANY]
     }
   },
   [KEYWORDS.NOT]: {
@@ -1091,8 +1096,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [UNKNOWN],
-            [RETURNS]: [UNKNOWN],
+            [TYPE_PROP]: [ANY],
+            [RETURNS]: [ANY],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
@@ -1113,8 +1118,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [UNKNOWN],
-            [RETURNS]: [UNKNOWN],
+            [TYPE_PROP]: [ANY],
+            [RETURNS]: [ANY],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
@@ -1143,7 +1148,7 @@ export const SPECIAL_FORM_TYPES = {
           }
         }
       ],
-      [RETURNS]: [UNKNOWN]
+      [RETURNS]: [ANY]
     }
   }
 }

package/src/utils.js

@@ -19,6 +19,11 @@ import { OPTIMIZATIONS } from './enchance.js'
 export const logError = (error) =>
   console.log('\x1b[31m', `\n${error}\n`, '\x1b[0m')
 export const logSuccess = (output) => console.log('\x1b[32m', output, '\x1b[0m')
+export const wrapInBracesString = (exp) => `(${stringifyArgs(exp)})`
+export const logExp = function (exp, marker = ':D') {
+  console.log(marker, wrapInBracesString(exp), ...[...arguments].slice(2))
+  return exp
+}
 export const formatCallstack = (callstack) =>
   callstack
     .reverse()
@@ -326,6 +331,7 @@ export const addTypeIdentities = (ast) => {
     identity(STATIC_TYPES.ATOM),
     identity(STATIC_TYPES.COLLECTION),
     identity(STATIC_TYPES.PREDICATE),
+    identity(STATIC_TYPES.ANY),
     identity(STATIC_TYPES.UNKNOWN)
   )
 }