Skip to content

Commit

Permalink
swift5: rename to swift6
Browse files Browse the repository at this point in the history
  • Loading branch information
asarhaddon authored and kanaka committed Oct 16, 2024
1 parent 1a3c858 commit 8169615
Show file tree
Hide file tree
Showing 29 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions IMPLS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ IMPL:
# - {IMPL: swift3, NO_DOCKER: 1, OS: xcode8}
- {IMPL: swift4}
# - {IMPL: swift4, NO_DOCKER: 1, OS: xcode10}
- {IMPL: swift5}
- {IMPL: swift5, NO_DOCKER: 1, OS: macos}
- {IMPL: swift6}
- {IMPL: swift6, NO_DOCKER: 1, OS: macos}

- {IMPL: vbs, NO_DOCKER: 1, OS: windows}
4 changes: 2 additions & 2 deletions Makefile.impls
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ IMPLS = ada ada.2 awk bash basic bbc-basic c c.2 chuck clojure coffee common-lis
guile haskell haxe hy io janet java java-truffle js jq julia kotlin latex3 livescript logo lua make mal \
matlab miniMAL nasm nim objc objpascal ocaml perl perl6 php picolisp pike plpgsql \
plsql powershell prolog ps purs python2 python3 r racket rexx rpython ruby ruby.2 rust scala scheme skew sml \
swift swift3 swift4 swift5 tcl ts vala vb vbs vhdl vimscript wasm wren yorick xslt zig
swift swift3 swift4 swift6 tcl ts vala vb vbs vhdl vimscript wasm wren yorick xslt zig

step5_EXCLUDES += bash # never completes at 10,000
step5_EXCLUDES += basic # too slow, and limited to ints of 2^16
Expand Down Expand Up @@ -188,7 +188,7 @@ sml_STEP_TO_PROG = impls/sml/$($(1))
swift_STEP_TO_PROG = impls/swift/$($(1))
swift3_STEP_TO_PROG = impls/swift3/$($(1))
swift4_STEP_TO_PROG = impls/swift4/$($(1))
swift5_STEP_TO_PROG = impls/swift5/$($(1))
swift6_STEP_TO_PROG = impls/swift6/$($(1))
tcl_STEP_TO_PROG = impls/tcl/$($(1)).tcl
ts_STEP_TO_PROG = impls/ts/$($(1)).js
vala_STEP_TO_PROG = impls/vala/$($(1))
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ FAQ](docs/FAQ.md) where I attempt to answer some common questions.
| [Standard ML](#sml) | [Fabian Bergström](https://github.com/fabjan) |
| [Swift 3](#swift-3) | [Joel Martin](https://github.com/kanaka) |
| [Swift 4](#swift-4) | [陆遥](https://github.com/LispLY) |
| [Swift 5](#swift-5) | [Oleg Montak](https://github.com/MontakOleg) |
| [Swift 6](#swift-6) | [Oleg Montak](https://github.com/MontakOleg) |
| [Tcl](#tcl-86) | [Dov Murik](https://github.com/dubek) |
| [TypeScript](#typescript) | [Masahiro Wakame](https://github.com/vvakame) |
| [Vala](#vala) | [Simon Tatham](https://github.com/sgtatham) |
Expand Down Expand Up @@ -1150,7 +1150,7 @@ The Swift 5 implementation of mal requires the Swift 5.0 compiler. It
has been tested with Swift 5.1.1 release.

```
cd impls/swift5
cd impls/swift6
swift run stepX_YYY
```

Expand Down
2 changes: 1 addition & 1 deletion docs/graph/base_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ languages:
- [scheme , Scheme (R7RS) , Lisp , Dynamic , [chibi,kawa,gauche,chicken,sagittarius,cyclone,foment]]
- [skew , Skew , OTHER , Static , []]
- [sml , "Standard ML" , ML , Static , []]
- [swift5 , "Swift 5" , C , Static , []]
- [swift6 , "Swift 6" , C , Static , []]
- [tcl , Tcl , OTHER , Dynamic , []]
- [ts , TypeScript , C , Static , []]
- [vala , Vala , C , Static , []]
Expand Down
2 changes: 1 addition & 1 deletion docs/graph/so-tags.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ Rate,TagName
"3129","userform"
"3128","multi-tenant"
"3125","expandablelistview"
"3123","swift5"
"3123","swift6"
"3122","sql-delete"
"3121","serverless-framework"
"3117","core-location"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ replEnv.set(forKey: "eval", val: .function(Func { args in
return try eval(expr, env: replEnv)
}))
replEnv.set(forKey: "*ARGV*", val: .list(CommandLine.arguments.dropFirst(2).map(Expr.string)))
replEnv.set(forKey: "*host-language*", val: .string("swift5"))
replEnv.set(forKey: "*host-language*", val: .string("swift6"))

rep("(def! not (fn* (a) (if a false true)))", env: replEnv)
rep(#"(def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))"#, env: replEnv)
Expand Down
File renamed without changes.

0 comments on commit 8169615

Please sign in to comment.