Merge branch 'development'

NEWS

@@ -1,3 +1,13 @@
+Changes of tre-0.6 relative to tre-0.5:
+  * PHP: PROPERTY-NAMES fixed for associative arrays.
+  * PHP: ASSOC-ARRAY? test if first key is a string.
+  * Curly brackets {} denote MAKE-OBJECT if the first element
+    is a string or keyword.
+  * MAKE-OBJECT, NEW, {}: Also takes keywords whose symbol names
+    are converted to downcase as property names.
+  * JS/PHP: COPY-PROPERTIES, MERGE-PROPERTIES, UPDATE-PROPERTIES:
+            New functions.
+
 Changes of tre-0.5 relative to tre-0.4:
   * LOG-MESSAGE returns its argument if logging has been
     switched off.

environment/stage1/curly.lisp

@@ -1,2 +1,5 @@
 (defmacro curly (&rest x)
-  `(progn ,@x))
+  (? (| (string? x.)
+        (keyword? x.))
+     `(make-object ,@x)
+     `(progn ,@x)))

environment/transpiler/environment/make-object.lisp

@@ -1,4 +1,6 @@
 (fn make-object (&rest x)
   (!= (%%%make-object)
     (@ (i (group x 2) !)
-      (%%%=-aref .i. ! i.))))
+      (%%%=-aref .i. ! (? (symbol? i.)
+                          (downcase (symbol-name i.))
+                          i.)))))

environment/transpiler/environment/property.lisp

@@ -5,3 +5,16 @@
   (& x
      (aprog1 (new)
        (@ [= (aref ! _.) ._] x))))
+
+(fn merge-properties (a b)
+  (aprog1 (new)
+    (@ (i (property-names a))
+      (= (aref ! i) (aref a i)))
+    (@ (i (property-names b))
+      (= (aref ! i) (aref b i)))))
+
+(fn copy-properties (x)
+  (merge-properties x nil))
+
+(fn update-properties (x &rest props)
+  (merge-properties x (apply #'make-object props)))

environment/transpiler/targets/javascript/core/atom.lisp

@@ -3,6 +3,7 @@
 
 (fn assoc-array? (x)
   (& (object? x)
+     (not (array? x))
      (not (defined? x.__tre-test))
      (not (defined? x.__class))))
 

environment/transpiler/targets/javascript/core/property-names.lisp

@@ -1,2 +1,3 @@
 (fn property-names (x)
-  (carlist (%property-list x)))
+  (& x
+     (carlist (%property-list x))))

environment/transpiler/targets/php/core/objectp.lisp

@@ -2,6 +2,5 @@
   (is_object x))
 
 (fn assoc-array? (x)
-  (& (not (array? x))
-     (is_array x)
-     (is_int (key x))))
+  (& (is_array x)
+     (is_string (key x))))

environment/transpiler/targets/php/core/property-names.lisp

@@ -1,2 +1,5 @@
 (fn property-names (x)
-  (array-list (array_keys (get_object_vars x))))
+  (& x
+     (array-list (array_keys (? (object? x)
+                                (get_object_vars x)
+                                x)))))

environment/version.lisp

@@ -1,12 +1,4 @@
-(defvar *tre-revision* 0)
-;    ,(with-open-file in (open "environment/_current-version" :direction 'input)
-;       (let l (string-list (read-line in))
-;         (list-string
-;           (alet (subseq l
-;                         (!? (position #\: l)
-;                             (++ !)
-;                             0)
-;                         (-- (length l)))
-;             (? (== #\M (car (last !)))
-;                (butlast !)
-;                !))))))
+(var *tre-revision* 
+     ,(with-open-file in (open "environment/_current-version" :direction 'input)
+        (+ 3291 ; Repository 'tre-historic'.
+           (read-number in))))

make.sh

@@ -1,8 +1,11 @@
 #!/bin/sh
-# tré – Copyright (c) 2005–2016 Sven Michael Klose <pixel@hugbox.org>
 
 set -e
 
+# Get revision number and date.
+git log | grep ^commit | wc -l >environment/_current-version
+date >environment/_release-date
+
 ARGS="$2 $3 $4 $5 $6 $7 $8 $9"
 
 SBCL="sbcl --noinform"