Merge pull request #186 from Distributive-Network/philippe/fix/176

Philippe/fix/176

Author: philippedistributive

LICENSE

@@ -19,3 +19,57 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Python Software Foundation License Version 2
+
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 
+Python Software Foundation; All Rights Reserved
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation;
+All Rights Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.

README.md

@@ -33,6 +33,7 @@ js_eval("console.log")('hello, world')
 - JS Date objects are represented by Python datetime.datetime objects
 - Intrinsics (boolean, number, null, undefined) are passed by value
 - JS Functions are automatically wrapped so that they behave like Python functions, and vice-versa
+- Python Lists are represented by JS true Arrays
 
 ### Roadmap
 - [done] JS instrinsics coerce to Python intrinsics
@@ -54,6 +55,7 @@ js_eval("console.log")('hello, world')
 - Python host environment supplies basic subsets of NodeJS's fs, path, process, etc, modules; as-needed by dcp-client (other project?)
 - [done] Python TypedArrays coerce to JS TypeArrays
 - [done] JS TypedArrays coerce to Python TypeArrays
+- [done] Python List coerce to JS Arrays
 
 ## Build Instructions
 
@@ -233,7 +235,7 @@ that if you update an object in JavaScript, the corresponding Dict in Python wil
 | Bool        | boolean
 | Function    | function
 | Dict        | object
-| List        | Array-like object
+| List        | Array
 | datetime    | Date object
 | awaitable   | Promise
 | Error       | Error object
@@ -248,7 +250,7 @@ that if you update an object in JavaScript, the corresponding Dict in Python wil
 | function             | Function
 | object - most        | pythonmonkey.JSObjectProxy (Dict)
 | object - Date        | datetime
-| object - Array       | List
+| object - Array       | pythonmonkey.JSArrayProxy (List)
 | object - Promise     | awaitable
 | object - ArrayBuffer | Buffer
 | object - type arrays | Buffer

cmake/modules/FindSpiderMonkey.cmake

@@ -40,6 +40,7 @@ endif()
 set(SPIDERMONKEY_PATHS
   "${CMAKE_CURRENT_SOURCE_DIR}/_spidermonkey_install"
   "${CMAKE_CURRENT_SOURCE_DIR}/_spidermonkey_install/lib"
+  "${CMAKE_CURRENT_SOURCE_DIR}/_spidermonkey_install/include/mozjs-115"
   ${SPIDERMONKEY_ROOT}
 	$ENV{SPIDERMONKEY_ROOT}
 	~/Library/Frameworks

include/DictType.hh

@@ -38,21 +38,6 @@ public:
   DictType(JSContext *cx, JS::Handle<JS::Value> jsObject);
 
   const TYPE returnType = TYPE::DICT;
-/**
- * @brief The 'set' method for a python dictionary. Sets the approprite 'key' in the dictionary with the appropriate 'value'
- *
- * @param key The key of the dictionary item
- * @param value The value of the dictionary item
- */
-  void set(PyType *key, PyType *value);
-
-/**
- * @brief Gets the dictionary item at the given 'key'
- *
- * @param key The key of the item in question
- * @return PyType* Returns a pointer to the appropriate PyType object
- */
-  PyType *get(PyType *key) const;
 };
 
 #endif