bare-script 4.1.1__tar.gz → 4.1.2__tar.gz

{bare_script-4.1.1/src/bare_script.egg-info → bare_script-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.1.1
+Version: 4.1.2
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs

{bare_script-4.1.1 → bare_script-4.1.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 4.1.1
+version = 4.1.2
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare_script-4.1.1 → bare_script-4.1.2}/src/bare_script/__init__.py

@@ -5,7 +5,7 @@
 bare-script package
 """
 
-import os as _os
+import os
 
 from .model import \
     lint_script, \
@@ -29,7 +29,7 @@ from .parser import \
 from .runtime import \
     BareScriptRuntimeError
 
-if not _os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
+if not os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
     try:
         from .runtime_c import evaluate_expression, execute_script
     except ImportError:

{bare_script-4.1.1 → bare_script-4.1.2}/src/bare_script/bare.py

@@ -7,7 +7,7 @@ bare-script command-line interface (CLI)
 
 import argparse
 from functools import partial
-import os as _os
+import os
 import sys
 import time
 
@@ -16,7 +16,7 @@ from .options import FETCH_SYSTEM_PREFIX, fetch_read_write, fetch_system, log_st
 from .parser import parse_expression, parse_script
 from .runtime import SYSTEM_GLOBAL_INCLUDES_NAME
 from .value import value_boolean
-if not _os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
+if not os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
     try:
         from .runtime_c import evaluate_expression, execute_script
     except ImportError:

{bare_script-4.1.1 → bare_script-4.1.2}/src/bare_script/library.py

@@ -11,7 +11,7 @@ import functools
 import importlib
 import json
 import math
-import os as _os
+import os
 import random
 import re
 import urllib
@@ -28,7 +28,7 @@ from .value import R_NUMBER_CLEANUP, ValueArgsError, value_args_model, value_arg
 # Helper to dynamically import evaluate_expression to avoid the circular dependency
 def _import_evaluate_expression():
     if not _EVALUATE_EXPRESSION:
-        if not _os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
+        if not os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
             try:
                 _EVALUATE_EXPRESSION.append(importlib.import_module('bare_script.runtime_c').evaluate_expression)
             except (ImportError, AttributeError):

{bare_script-4.1.1 → bare_script-4.1.2}/src/bare_script/runtime.py

@@ -224,13 +224,17 @@ def _script_function(script, function, args, options):
     if func_args is not None:
         args_length = len(args)
         func_args_length = len(func_args)
-        ix_arg_last = function.get('lastArgArray', None) and (func_args_length - 1)
-        for ix_arg in range(func_args_length):
-            arg_name = func_args[ix_arg]
-            if ix_arg < args_length:
-                func_locals[arg_name] = args[ix_arg] if ix_arg != ix_arg_last else args[ix_arg:]
-            else:
-                func_locals[arg_name] = [] if ix_arg == ix_arg_last else None
+        if function.get('lastArgArray'):
+            ix_arg_last = func_args_length - 1
+            for ix_arg in range(func_args_length):
+                arg_name = func_args[ix_arg]
+                if ix_arg < args_length:
+                    func_locals[arg_name] = args[ix_arg] if ix_arg != ix_arg_last else args[ix_arg:]
+                else:
+                    func_locals[arg_name] = [] if ix_arg == ix_arg_last else None
+        else:
+            for ix_arg in range(func_args_length):
+                func_locals[func_args[ix_arg]] = args[ix_arg] if ix_arg < args_length else None
     return _execute_script_helper(script, function['statements'], options, func_locals)
 
 
@@ -399,35 +403,35 @@ def evaluate_expression(expr, options=None, locals_=None, builtins=True, script=
                 (right_type is int or right_type is float)):
                 return left_value / right_value
 
-        elif bin_op == '==':
-            if (left_type is int or left_type is float) and (right_type is int or right_type is float):
-                return left_value == right_value
-            return value_compare(left_value, right_value) == 0
-
-        elif bin_op == '!=':
+        elif bin_op == '<':
             if (left_type is int or left_type is float) and (right_type is int or right_type is float):
-                return left_value != right_value
-            return value_compare(left_value, right_value) != 0
+                return left_value < right_value
+            return value_compare(left_value, right_value) < 0
 
         elif bin_op == '<=':
             if (left_type is int or left_type is float) and (right_type is int or right_type is float):
                 return left_value <= right_value
             return value_compare(left_value, right_value) <= 0
 
-        elif bin_op == '<':
+        elif bin_op == '>':
             if (left_type is int or left_type is float) and (right_type is int or right_type is float):
-                return left_value < right_value
-            return value_compare(left_value, right_value) < 0
+                return left_value > right_value
+            return value_compare(left_value, right_value) > 0
 
         elif bin_op == '>=':
             if (left_type is int or left_type is float) and (right_type is int or right_type is float):
                 return left_value >= right_value
             return value_compare(left_value, right_value) >= 0
 
-        elif bin_op == '>':
+        elif bin_op == '==':
             if (left_type is int or left_type is float) and (right_type is int or right_type is float):
-                return left_value > right_value
-            return value_compare(left_value, right_value) > 0
+                return left_value == right_value
+            return value_compare(left_value, right_value) == 0
+
+        elif bin_op == '!=':
+            if (left_type is int or left_type is float) and (right_type is int or right_type is float):
+                return left_value != right_value
+            return value_compare(left_value, right_value) != 0
 
         elif bin_op == '%':
             # number % number
@@ -443,32 +447,32 @@ def evaluate_expression(expr, options=None, locals_=None, builtins=True, script=
 
         elif bin_op == '&':
             # int & int
-            if ((left_type is int or left_type is float) and int(left_value) == left_value and
-                (right_type is int or right_type is float) and int(right_value) == right_value):
+            if ((left_type is int or (left_type is float and left_value.is_integer())) and
+                (right_type is int or (right_type is float and right_value.is_integer()))):
                 return int(left_value) & int(right_value)
 
         elif bin_op == '|':
             # int & int
-            if ((left_type is int or left_type is float) and int(left_value) == left_value and
-                (right_type is int or right_type is float) and int(right_value) == right_value):
+            if ((left_type is int or (left_type is float and left_value.is_integer())) and
+                (right_type is int or (right_type is float and right_value.is_integer()))):
                 return int(left_value) | int(right_value)
 
         elif bin_op == '^':
             # int & int
-            if ((left_type is int or left_type is float) and int(left_value) == left_value and
-                (right_type is int or right_type is float) and int(right_value) == right_value):
+            if ((left_type is int or (left_type is float and left_value.is_integer())) and
+                (right_type is int or (right_type is float and right_value.is_integer()))):
                 return int(left_value) ^ int(right_value)
 
         elif bin_op == '<<':
             # int & int
-            if ((left_type is int or left_type is float) and int(left_value) == left_value and
-                (right_type is int or right_type is float) and int(right_value) == right_value):
+            if ((left_type is int or (left_type is float and left_value.is_integer())) and
+                (right_type is int or (right_type is float and right_value.is_integer()))):
                 return int(left_value) << int(right_value)
 
         else: # bin_op == '>>':
             # int & int
-            if ((left_type is int or left_type is float) and int(left_value) == left_value and
-                (right_type is int or right_type is float) and int(right_value) == right_value):
+            if ((left_type is int or (left_type is float and left_value.is_integer())) and
+                (right_type is int or (right_type is float and right_value.is_integer()))):
                 return int(left_value) >> int(right_value)
 
         # Invalid operation values
@@ -486,7 +490,7 @@ def evaluate_expression(expr, options=None, locals_=None, builtins=True, script=
             if val_type is int or val_type is float:
                 return -value
         else: # unary_op == '~':
-            if (val_type is int or val_type is float) and int(value) == value:
+            if val_type is int or (val_type is float and value.is_integer()):
                 return ~int(value)
 
         # Invalid operation value

{bare_script-4.1.1 → bare_script-4.1.2}/src/bare_script/runtime_c.c

@@ -400,42 +400,58 @@ script_function_call(PyObject *script, PyObject *function, PyObject *args, PyObj
 
         PyObject *last_arg_array = dict_getitem_borrow(function, K_lastArgArray);
         if (PyErr_Occurred()) { Py_DECREF(func_locals); return NULL; }
-        Py_ssize_t ix_arg_last = -1;
-        if (last_arg_array != NULL && PyObject_IsTrue(last_arg_array) == 1) {
-            ix_arg_last = func_args_length - 1;
-        }
-
-        for (Py_ssize_t ix = 0; ix < func_args_length; ix++) {
-            PyObject *arg_name = PyList_GET_ITEM(func_args, ix);
-            PyObject *val = NULL;
-            int needs_decref = 0;
-            if (ix < args_length) {
-                if (ix == ix_arg_last) {
-                    /* args[ix:] */
-                    if (PyList_Check(args)) {
-                        val = PyList_GetSlice(args, ix, args_length);
+        int has_last_arg_array = (last_arg_array != NULL && PyObject_IsTrue(last_arg_array) == 1);
+
+        if (has_last_arg_array) {
+            Py_ssize_t ix_arg_last = func_args_length - 1;
+            for (Py_ssize_t ix = 0; ix < func_args_length; ix++) {
+                PyObject *arg_name = PyList_GET_ITEM(func_args, ix);
+                PyObject *val = NULL;
+                int needs_decref = 0;
+                if (ix < args_length) {
+                    if (ix == ix_arg_last) {
+                        /* args[ix:] */
+                        if (PyList_Check(args)) {
+                            val = PyList_GetSlice(args, ix, args_length);
+                        } else {
+                            val = PySequence_GetSlice(args, ix, args_length);
+                        }
+                        if (!val) { Py_DECREF(func_locals); return NULL; }
+                        needs_decref = 1;
                     } else {
-                        val = PySequence_GetSlice(args, ix, args_length);
+                        val = PySequence_GetItem(args, ix);
+                        if (!val) { Py_DECREF(func_locals); return NULL; }
+                        needs_decref = 1;
                     }
-                    if (!val) { Py_DECREF(func_locals); return NULL; }
-                    needs_decref = 1;
                 } else {
-                    val = PySequence_GetItem(args, ix);
-                    if (!val) { Py_DECREF(func_locals); return NULL; }
-                    needs_decref = 1;
+                    if (ix == ix_arg_last) {
+                        val = PyList_New(0);
+                        if (!val) { Py_DECREF(func_locals); return NULL; }
+                        needs_decref = 1;
+                    } else {
+                        val = Py_None;
+                    }
                 }
-            } else {
-                if (ix == ix_arg_last) {
-                    val = PyList_New(0);
+                int rc = PyDict_SetItem(func_locals, arg_name, val);
+                if (needs_decref) Py_DECREF(val);
+                if (rc < 0) { Py_DECREF(func_locals); return NULL; }
+            }
+        } else {
+            for (Py_ssize_t ix = 0; ix < func_args_length; ix++) {
+                PyObject *arg_name = PyList_GET_ITEM(func_args, ix);
+                PyObject *val;
+                int needs_decref = 0;
+                if (ix < args_length) {
+                    val = PySequence_GetItem(args, ix);
                     if (!val) { Py_DECREF(func_locals); return NULL; }
                     needs_decref = 1;
                 } else {
                     val = Py_None;
                 }
+                int rc = PyDict_SetItem(func_locals, arg_name, val);
+                if (needs_decref) Py_DECREF(val);
+                if (rc < 0) { Py_DECREF(func_locals); return NULL; }
             }
-            int rc = PyDict_SetItem(func_locals, arg_name, val);
-            if (needs_decref) Py_DECREF(val);
-            if (rc < 0) { Py_DECREF(func_locals); return NULL; }
         }
     }
 
@@ -588,12 +604,12 @@ op_to_id(PyObject *op)
     if (op == K_op_minus) return OP_MINUS;
     if (op == K_op_star) return OP_STAR;
     if (op == K_op_slash) return OP_SLASH;
-    if (op == K_op_eq) return OP_EQ;
-    if (op == K_op_ne) return OP_NE;
-    if (op == K_op_le) return OP_LE;
     if (op == K_op_lt) return OP_LT;
-    if (op == K_op_ge) return OP_GE;
+    if (op == K_op_le) return OP_LE;
     if (op == K_op_gt) return OP_GT;
+    if (op == K_op_ge) return OP_GE;
+    if (op == K_op_eq) return OP_EQ;
+    if (op == K_op_ne) return OP_NE;
     if (op == K_op_pct) return OP_PCT;
     if (op == K_op_star_star) return OP_STAR_STAR;
     if (op == K_op_amp_amp) return OP_AND_AND;
@@ -611,12 +627,12 @@ op_to_id(PyObject *op)
     if (PyUnicode_Compare(op, K_op_minus) == 0) return OP_MINUS;
     if (PyUnicode_Compare(op, K_op_star) == 0) return OP_STAR;
     if (PyUnicode_Compare(op, K_op_slash) == 0) return OP_SLASH;
-    if (PyUnicode_Compare(op, K_op_eq) == 0) return OP_EQ;
-    if (PyUnicode_Compare(op, K_op_ne) == 0) return OP_NE;
-    if (PyUnicode_Compare(op, K_op_le) == 0) return OP_LE;
     if (PyUnicode_Compare(op, K_op_lt) == 0) return OP_LT;
-    if (PyUnicode_Compare(op, K_op_ge) == 0) return OP_GE;
+    if (PyUnicode_Compare(op, K_op_le) == 0) return OP_LE;
     if (PyUnicode_Compare(op, K_op_gt) == 0) return OP_GT;
+    if (PyUnicode_Compare(op, K_op_ge) == 0) return OP_GE;
+    if (PyUnicode_Compare(op, K_op_eq) == 0) return OP_EQ;
+    if (PyUnicode_Compare(op, K_op_ne) == 0) return OP_NE;
     if (PyUnicode_Compare(op, K_op_pct) == 0) return OP_PCT;
     if (PyUnicode_Compare(op, K_op_star_star) == 0) return OP_STAR_STAR;
     if (PyUnicode_Compare(op, K_op_amp_amp) == 0) return OP_AND_AND;

{bare_script-4.1.1 → bare_script-4.1.2/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.1.1
+Version: 4.1.2
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs