Skip to content

Commit a44c167

Browse files
TimTim
Tim
authored and
Tim
committed
Refactor, debug
1 parent 351a042 commit a44c167

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1525
-637
lines changed

‎examples/sql.pf‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
def // We define our data type!
1+
newtype
22

33
Person = struct(name varchar(32), age int)
44

5-
cmd // We wrap some commands around SQL.
5+
cmd
66

7-
main : // Create the table on initialization if it isn't there.
7+
init : // Create the table on initialization if it isn't there.
88
put SQL -- CREATE TABLE IF NOT EXISTS People |Person|
99

1010
clear :
1111
put SQL -- DROP TABLE People
12-
main
12+
init
1313

1414
add (name string, age int) :
1515
put SQL --
@@ -20,14 +20,16 @@ show (name string) :
2020
get personList as Person from SQL --
2121
SELECT * FROM People
2222
WHERE name=|name|
23-
post prettyFmt(personList) to Output()
23+
post prettyFmt(personList)
2424

2525
show all :
2626
get peopleList as Person from SQL --
2727
SELECT * FROM People
28-
post prettyFmt(peopleList) to Output()
28+
post prettyFmt(peopleList)
29+
30+
def // Prettyprinting functions, omitted.
31+
2932

30-
def // Some functions to do the formatting.
3133

3234
HEADING = "\n" + spaceOut("Name", "Age") + repeat(36, "-") + "\n"
3335

‎examples/sql2.pf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ newtype
33
Person = struct(name string, age int)
44

55
init :
6-
put SQL --- CREATE TABLE IF NOT EXISTS People |Person|
6+
put SQL -- CREATE TABLE IF NOT EXISTS People |Person|
77

88
add (name string, age int) :
9-
put SQL ---
9+
put SQL --
1010
INSERT INTO People
1111
VALUES |name, age|
1212

‎examples/temp.pf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
cmd
2+
3+
foo :
4+
post -- zort
5+
post "troz"
6+

‎go.mod‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
module github.com/tim-hardcastle/Pipefish
22

3-
go 1.23
3+
go 1.23.0
4+
5+
toolchain go1.23.1
46

57
require (
68
github.com/lmorg/readline v0.0.0-20210316231630-be4b7d79fc3a
7-
golang.org/x/sys v0.28.0 // indirect
9+
golang.org/x/sys v0.31.0 // indirect
810
)
911

1012
require (
@@ -83,9 +85,9 @@ require (
8385
golang.org/x/mod v0.22.0 // indirect
8486
golang.org/x/net v0.32.0 // indirect
8587
golang.org/x/oauth2 v0.7.0 // indirect
86-
golang.org/x/sync v0.10.0 // indirect
87-
golang.org/x/term v0.27.0 // indirect
88-
golang.org/x/text v0.21.0 // indirect
88+
golang.org/x/sync v0.12.0 // indirect
89+
golang.org/x/term v0.30.0 // indirect
90+
golang.org/x/text v0.23.0 // indirect
8991
golang.org/x/tools v0.28.0 // indirect
9092
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
9193
google.golang.org/appengine v1.6.7 // indirect
@@ -109,7 +111,7 @@ require (
109111
github.com/microsoft/go-mssqldb v1.7.2
110112
github.com/nakagami/firebirdsql v0.9.4
111113
github.com/sijms/go-ora v1.3.2
112-
golang.org/x/crypto v0.30.0
114+
golang.org/x/crypto v0.36.0
113115
modernc.org/sqlite v1.31.1
114116
src.elv.sh v0.20.1
115117
)

‎go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
226226
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
227227
golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
228228
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
229+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
230+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
229231
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
230232
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
231233
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -269,6 +271,8 @@ golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
269271
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
270272
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
271273
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
274+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
275+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
272276
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
273277
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
274278
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -299,6 +303,8 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
299303
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
300304
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
301305
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
306+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
307+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
302308
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
303309
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
304310
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -311,6 +317,8 @@ golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
311317
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
312318
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
313319
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
320+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
321+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
314322
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
315323
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
316324
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -325,6 +333,8 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
325333
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
326334
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
327335
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
336+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
337+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
328338
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
329339
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
330340
golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=

‎hub/hub.hub‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
newtype
22

3-
DatabaseDrivers = enum COCKROACHDB, FIREBIRD_SQL, MARIADB, MICROSOFT_SQL_SERVER, MYSQL, ORACLE,
4-
.. POSTGRESQL, SNOWFLAKE, SQLITE, TIDB
3+
DatabaseDrivers = enum FEE, FIE, FO, FOO
54

65
Database = struct(driver DatabaseDrivers, name, host string, port int, username, password string)
76

0 commit comments

Comments
 (0)