Merge branch 'master' of jsoftware.com:jsource

stab at fixing clang crash

Author: HenryHRich

.github/workflows/jsource.yml

@@ -56,7 +56,7 @@ jobs:
       strip -S libjavx512.so || true
       strip -S libtsdll.so
       strip -S jamalgam || true
-      strip -S libgmp.so
+      strip -S libgmp.so || true
       cd -
       ls -l j64
       zip -r l64.zip j64
@@ -149,7 +149,7 @@ jobs:
       strip -S libj.so
       strip -S libtsdll.so
       strip -S jamalgam || true
-      strip -S libgmp.so
+      strip -S libgmp.so || true
       cd -
       ls -l j32
       zip -r l32.zip j32
@@ -383,7 +383,7 @@ jobs:
       strip -S libj.so
       strip -S libtsdll.so
       strip -S jamalgam || true
-      strip -S libgmp.so
+      strip -S libgmp.so || true
       cd -
       ls -l j64
       zip -r rpi64.zip j64
@@ -440,7 +440,7 @@ jobs:
       strip -S libj.so
       strip -S libtsdll.so
       strip -S jamalgam || true
-      strip -S libgmp.so
+      strip -S libgmp.so || true
       cd -
       ls -l j32
       zip -r rpi32.zip j32
@@ -492,7 +492,7 @@ jobs:
        strip -S libj.so
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        zip -r rpi64.zip j64
        zip rpi64.zip /usr/bin/zip
@@ -559,7 +559,7 @@ jobs:
        strip -S libj.so
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        zip -r rpi32.zip j32
        rm -rf j32
@@ -633,7 +633,7 @@ jobs:
        strip -S libjavx512.so || true
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        ls -l j64
        zip -r obsd64.zip j64
@@ -702,7 +702,7 @@ jobs:
        strip -S libjavx512.so || true
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        ls -l j64
        zip -r obsd64.zip j64
@@ -769,7 +769,7 @@ jobs:
        strip -S libj.so
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        ls -l j64
        zip -r obsdarm64.zip j64
@@ -842,7 +842,7 @@ jobs:
        strip -S libjavx512.so || true
        strip -S jamalgam || true
        strip -S libtsdll.so
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        ls -l j64
        zip -r fbsd64.zip j64
@@ -915,7 +915,7 @@ jobs:
        strip -S libjavx512.so || true
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        ls -l j64
        zip -r fbsd64.zip j64
@@ -989,7 +989,7 @@ jobs:
        strip -S libjavx512.so || true
        strip -S libtsdll.so
        strip -S jamalgam || true
-       strip -S libgmp.so
+       strip -S libgmp.so || true
        cd -
        ls -l j64
        zip -r fbsdarm64.zip j64
@@ -1103,6 +1103,7 @@ jobs:
    - name: Build JE (Windows)
      shell: cmd
      env:
+      NASM: ${{github.workspace}}\openssl-asm\nasm
       USE_PYXES: 1
       USE_EMU_AVX: 1
      run: |
@@ -1152,6 +1153,7 @@ jobs:
    - name: Build JE (Windows 32)
      shell: cmd
      env:
+      NASM: ${{github.workspace}}\openssl-asm\nasm
       USE_PYXES: 0
       USE_EMU_AVX: 0
      run: |
@@ -1285,12 +1287,12 @@ jobs:
       path: testwinarm64.txt
       overwrite: true
 
-      # Name	      Prefix	     Toolchain	Architecture	C Library	C++ Library
-      # MSYS	      /usr	       gcc	      x86_64	      cygwin	   libstdc++
-      # UCRT64	    /ucrt64	    gcc	      x86_64	      ucrt	     libstdc++
-      # CLANG64	   /clang64	   llvm	     x86_64	      ucrt	     libc++
-      # CLANGARM64	/clangarm64	llvm	     aarch64	     ucrt	     libc++
-      # MINGW64	   /mingw64	   gcc	      x86_64	      msvcrt	   libstdc++
+      # Name        Prefix       Toolchain  Architecture  C Library C++ Library
+      # MSYS        /usr         gcc        x86_64        cygwin    libstdc++
+      # UCRT64      /ucrt64      gcc        x86_64        ucrt      libstdc++
+      # CLANG64     /clang64     llvm       x86_64        ucrt      libc++
+      # CLANGARM64  /clangarm64  llvm       aarch64       ucrt      libc++
+      # MINGW64     /mingw64     gcc        x86_64        msvcrt    libstdc++
       # { sys: mingw64, env: x86_64 }
       # { sys: mingw32, env: i686 }
       # { sys: ucrt64,  env: ucrt-x86_64 }
@@ -1340,6 +1342,19 @@ jobs:
      run: |
       script/testga.sh windows x86_64 || exit 1
 
+   - name: Compress Files (Windows MSYS2 x64)
+     shell: pwsh
+     run: Compress-Archive j64 w64mw.zip
+
+   - name: Release JE (Windows MSYS2 x64)
+     uses: ncipollo/release-action@v1
+     with:
+      tag: build
+      artifacts: "w64mw.zip"
+      token: ${{ secrets.GITHUB_TOKEN }}
+      allowUpdates: true
+      replacesArtifacts: true
+
 # windows msys2 x86 ----------------------------------------------------
  jewin-msys2-x86:
   name: JE (Windows MSYS2 x86)
@@ -1383,6 +1398,19 @@ jobs:
      run: |
       script/testga.sh windows i386 || exit 1
 
+   - name: Compress Files (Windows MSYS2 x86)
+     shell: pwsh
+     run: Compress-Archive j32 w32mw.zip
+
+   - name: Release JE (Windows MSYS2 x86)
+     uses: ncipollo/release-action@v1
+     with:
+      tag: build
+      artifacts: "w32mw.zip"
+      token: ${{ secrets.GITHUB_TOKEN }}
+      allowUpdates: true
+      replacesArtifacts: true
+
 # windows msys2 arm64 --------------------------------------------------
  jewin-msys2-arm64:
   name: JE (Windows MSYS2 arm64)
@@ -1431,7 +1459,26 @@ jobs:
  tests:
   name: Test Results
   runs-on: ubuntu-22.04
-  needs: [jelinux, jelinux-gcc, jelinux32, jelinuxd, jemacos, jemacosarm, jerpi64arm, jerpi32arm, jewin, jewin32, jewinarm64, jeandroid, jefreebsd2, jefreebsdarm64, jeopenbsd2, jeopenbsdarm64 ]
+# the needs definition below is also given later in webhook
+# this allows tests to be run that can be ignored for the webhook
+# AFAIK there is no cleaner way to do this
+  needs:
+   - jelinux
+   - jelinux-gcc
+   - jelinux32
+   - jelinuxd
+   - jemacos
+   - jemacosarm
+   - jerpi64arm
+   - jerpi32arm
+   - jewin
+   - jewin32
+   - jewinarm64
+   - jeandroid
+   - jefreebsd2
+   - jefreebsdarm64
+   - jeopenbsd2
+   - jeopenbsdarm64
   steps:
    - name: Checkout Git repository
      uses: actions/checkout@v4
@@ -1456,7 +1503,25 @@ jobs:
  webhook:
   name: Run Webhook
   runs-on: ubuntu-22.04
-  needs: tests
+# this needs is also in tests above
+# comment out any needs not used by the webhook
+  needs:
+   - jelinux
+#   - jelinux-gcc
+   - jelinux32
+   - jelinuxd
+   - jemacos
+   - jemacosarm
+   - jerpi64arm
+   - jerpi32arm
+   - jewin
+   - jewin32
+   - jewinarm64
+   - jeandroid
+   - jefreebsd2
+   - jefreebsdarm64
+   - jeopenbsd2
+   - jeopenbsdarm64
   steps:
    - name: update server
      uses: distributhor/workflow-webhook@v2

…ry/addons/data/dictionary/dictionary.ijs jlibrary/addons/data/dict/dict.ijsjlibrary/addons/data/dictionary/dictionary.ijs renamed to jlibrary/addons/data/dict/dict.ijs jlibrary/addons/data/dictionary/dictionary.ijs renamed to jlibrary/addons/data/dict/dict.ijs

@@ -1,4 +1,4 @@
-coclass 'jdictionary'
+coclass 'jdict'
 
 SIZE_GROWTH_GEOMETRIC_STEP =: 2
 
@@ -17,6 +17,18 @@ valueshape =: i. 0
 keyhash =: 16!:0`''
 keycompare =: 16!:0`''
 initcapacity =: 100
+NB. Names of params.
+long_param_names =: <;._2 {{)n
+keytype
+keyshape
+valuetype
+valueshape
+keyhash
+keycompare
+initcapacity
+}}
+short_param_names =: 4 2 $ 'ktksvtvs'
+search_short_param_names =: short_param_names&i.
 
 if. (-: (index_type {.~ -@#)) 'concurrent' do.
   singlethreaded =. 0
@@ -30,18 +42,18 @@ case. 'hash' do.
   itype =: 0   NB. index type 0 is hash
   occupancy =: 0.5   NB. default for occupancy
   NB. Parse params and update above attributes.
+  long_param_names =: long_param_names , < 'occupancy'
+  search_long_param_names =: long_param_names&i.
   parse^:(*@#) creation_parameters
   internal_parameters =. (0 , initcapacity , <. initcapacity % occupancy) ; singlethreaded ; (keytype ; keyshape) ; < (valuetype ; valueshape)
 case. 'tree' do.
   itype =: 1  NB. index type 1 is tree
   NB. Parse params and update above attributes.
+  search_long_param_names =: long_param_names&i.
   parse^:(*@#) creation_parameters
-  if. 0 <: 4!:0 < 'occupancy' do.
-     13!:8 (3) [ 'Parameter not supported in tree dictionary: occupancy'
-  end.
   internal_parameters =. (0 , initcapacity) ; singlethreaded ; (keytype ; keyshape) ; < (valuetype ; valueshape)
 case. do.
-  13!:8 (3) [ 'Incorrect index type'
+  13!:8&3 'Incorrect index type'
 end.
 
 NB. Create the map, which remains as dict.  dict is marked nondisplayable because 1 {:: dict is.
@@ -114,6 +126,11 @@ n {~ (<;._1 t) i. < y
 NB. Parse attribute and set its value.
 parse =: {{)m
 'attribute value' =: y
+if. (# short_param_names) > idx =. search_short_param_names attribute do.
+  attribute =. idx {:: long_param_names
+end.
+incorrect =. (# long_param_names) -: search_long_param_names < attribute
+13!:8&3^:incorrect attribute , ' parameter not supported'
 if. ('literal' -: datatype value) *. (attribute -: 'keytype') +. attribute -: 'valuetype' do.
   value =. typeid_from_typename value
 end.

jlibrary/system/main/regex.ijs

@@ -178,22 +178,38 @@ NB. =========================================================
 NB. pcre2 library is in bin or tools/regex
 3 : 0''
 select. UNAME
-case. 'Win' do. t=. 'jpcre2.dll'
-case. 'Darwin' do. t=. 'libjpcre2.dylib'
 case. 'Android' do. pcre2dll=: 'libjpcre2.so' return.
-case. do. t=. 'libjpcre2.so'
+case. 'Darwin' do. t0=. 'libjpcre2' [ ext=. '.dylib' [ arch=. ''
+case. 'Win' do. t0=. 'jpcre2' [ ext=. '.dll' [ arch=. ((-.IF64)#<'_32'),(('arm64'-:9!:56'cpu')#<'_arm64')
+case. do.
+  t0=. 'libjpcre2' [ ext=. '.so'
+  if. IFRASPI do.
+    arch=. ((-.IF64)#<'_32')
+  else.
+    arch=. ((-.IF64)#<'_32'),(('arm64'-:9!:56'cpu')#<'_arm64')
+  end.
 end.
 
-f=. BINPATH,'/',t
-if. 0 = 1!:4 :: 0: <f do.
-  f=. jpath '~tools/regex/',t
+found=. 0
+for_ar. arch do.
+  if. 1= ftype f=. BINPATH,'/',t0,(>ar),ext do.
+    found=. 1 break.
+  elseif. 1= ftype f=. jpath '~tools/regex/',t0,(>ar),ext do.
+    found=. 1 break.
+  end.
+end.
+
+if. -.found do.
+  if. 1= ftype f=. BINPATH,'/',t0,ext do.
+    found=. 1
+  elseif. 1= ftype f=. jpath '~tools/regex/',t0,ext do.
+    found=. 1
+  end.
 end.
 
 NB. fall back one more time
-if. IFUNIX *. 0 = 1!:4 :: 0: <f do.
-  f=. unxlib 'pcre2'
-elseif. 0 = 1!:4 :: 0: <f do.
-  f=. t
+if. -.found do.
+  if. IFUNIX do. f=. unxlib 'pcre2' else. f=. 'pcre2-8',ext end.
 end.
 
 pcre2dll=: f

jlibrary/system/main/stdlib.ijs

@@ -1,7 +1,7 @@
 cocurrent <'z'
 3 : 0 ''
 
-JLIB=: '9.7.8'
+JLIB=: '9.7.10'
 
 notdef=. 0: ~: 4!:0 @ <
 hostpathsep=: ('/\'{~6=9!:12'')&(I. @ (e.&'/\')@] })

jlibrary/system/util/pacman.ijs

@@ -1365,6 +1365,7 @@ readlocal=: 3 : 0
 readlin''
 ADDONS=: fixjal freads ADDCFG,'addons.txt'
 ADDINS=: fixjal2 freads ADDCFG,'addins.txt'
+ADDINS=: ADDINS {~ <<< I. -. ({."1 ADDINS) e. {."1 ADDONS
 REV=: fixrev freads ADDCFG,'revision.txt'
 LASTUPD=: fixupd freads ADDCFG,'lastupdate.txt'
 LIBS=: fixlibs freads ADDCFG,'library.txt'

jlibrary/system/util/scripts.ijs

@@ -15,7 +15,7 @@ colortab   ~addons/graphics/color/colortab.ijs
 csv        ~addons/tables/csv/csv.ijs
 dd         ~addons/data/odbc/odbc.ijs
 debug      ~addons/ide/qt/debugs.ijs
-dictionary ~addons/data/dictionary/dictionary.ijs
+dict       ~addons/data/dict/dict.ijs
 gl2        ~addons/graphics/gl2/gl2.ijs
 gles       ~addons/api/gles/gles.ijs
 graph      ~addons/graphics/graph/graph.ijs