Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile + Github Action #11

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b482b2b
Added a basic Makefile
faddat Feb 13, 2021
c5d351b
Finished Makefile, added some comments to goscan.go
faddat Feb 13, 2021
7b27422
Create make.yml
faddat Feb 13, 2021
2907adf
Update make.yml
faddat Feb 13, 2021
8d83784
Update make.yml
faddat Feb 13, 2021
1050ae2
Update Makefile
faddat Feb 13, 2021
7039e2e
Update Makefile
faddat Feb 13, 2021
7e7a53f
enable building gnoland
faddat Feb 14, 2021
9eb7086
Implemented the techknowlogic version of xgo for multiplatofrm builds
faddat Feb 14, 2021
e4b2043
Update make.yml
faddat Feb 14, 2021
16c0eaa
Update Makefile
faddat Feb 14, 2021
50af14f
Update Makefile
faddat Feb 14, 2021
d5d055b
Update Makefile
faddat Feb 14, 2021
ee66474
Update make.yml
faddat Feb 14, 2021
a0ad981
Update Makefile
faddat Feb 14, 2021
8b22b7d
Update make.yml
faddat Feb 14, 2021
4fc50e0
Update make.yml
faddat Feb 14, 2021
022abce
Update and rename make.yml to build.yml
faddat Feb 14, 2021
1034ecc
Update Makefile
faddat Feb 14, 2021
fa1c2e1
Updated build process
faddat Feb 14, 2021
b569f92
Added HasBorder to the Border struct so that tests pass
faddat Feb 14, 2021
8fbae43
Update build.yml
faddat Feb 14, 2021
df1023f
Update build.yml
faddat Feb 14, 2021
48e39a4
Update build.yml
faddat Feb 14, 2021
0926ffa
Merge https://github.com/gnolang/gno into gitpod
faddat Feb 14, 2021
fdc8774
Update README.md
faddat Feb 14, 2021
d4f89e6
Update README.md
faddat Feb 14, 2021
f531d89
https://stackoverflow.com/questions/38172661/what-is-the-meaning-of-and
faddat Feb 14, 2021
e8b1b5d
Corrected some issues
faddat Feb 14, 2021
d51cd1c
Added comments
faddat Feb 14, 2021
7e482c1
Update Makefile
faddat Feb 15, 2021
468ef63
Update build.yml
faddat Feb 15, 2021
77b2eb8
added plain "go test"
faddat Feb 20, 2021
a7012ed
Merge https://github.com/gnolang/gno into gitpod
faddat Feb 20, 2021
f2aa9b7
Added CHANGELOG
faddat Feb 21, 2021
493b6d8
Merge https://github.com/gnolang/gno into gitpod
faddat Feb 22, 2021
d54a358
Added new phonies for active dev
faddat Feb 22, 2021
9d8db4b
Merge https://github.com/gnolang/gno into gitpod
faddat Feb 25, 2021
94d42a8
Merge https://github.com/gnolang/gno into gitpod
faddat Feb 28, 2021
146f11a
Create Readme.md
faddat Mar 15, 2021
dadeb93
Xgo removed, basic guidelines added.
faddat Apr 4, 2021
ba9e1c5
Update build.yml
faddat Apr 4, 2021
aaf1af5
Update Readme.md
faddat Apr 11, 2021
017eae9
update gitpod branch
faddat Apr 12, 2021
1163566
update gitpod branch
faddat Apr 12, 2021
c78cf7c
Merge branch 'gnolang:master' into gitpod
faddat May 27, 2021
3dc591d
This is bringing the "Gitpod" branch up to speed with Jae's master so…
faddat Jun 1, 2021
087480c
Merge branch 'gitpod' of https://github.com/faddat/gno
faddat Jun 14, 2021
bde085f
Merge branch 'master' of https://github.com/gnolang/gno
faddat Jun 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: build
on: [push, pull_request]

jobs:
native:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: '^1.16'
- name: build
run: make
- uses: actions/upload-artifact@v2
with:
name: gnoland
path: |
gnoland
goscan
logos


test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup go
uses: actions/setup-go@v2
with:
go-version: '^1.16'
- name: build
run: make test
30 changes: 30 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
- First commits
- Logos browser
- Tests from Yagi
- Makefile
- Github action
- Expanded Readme with information about the project

### Changed
- Moved Logos

### Removed



## [1.0.0] - 2017-06-20
### Added


### Changed


### Removed
35 changes: 35 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1 +1,36 @@
all: gnoland goscan logos

.PHONY: logos goscan gnoland


# NB: Binaries will output in the folder github.com/gnoland
targets = windows/amd64,windows/arm64,darwin-10.14/arm64,darwin-10.14/amd64,linux/*

# The main show
gnoland:
echo "Building gnoland"
go build -o gnoland ./cmd/gnoland

# goscan scans go code to determine its AST
goscan:
echo "Building goscan"
go build -o goscan ./cmd/goscan


# Logos is the interface to Gnoland
logos:
echo "building logos"
go build -o logos ./logos/cmd/logos.go

clean:
rm -rf build

test:
echo "Running tests"
go test
go test tests/*.go -v -run="Test/realm.go"


# TODO stringer -type=Op
# Unsure what the above refers to. Created a basic Makefile.

15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ simulated by the Gnomes of the Greater Resistance.

## Status

_Update Feb 13th, 2021: Implemented Logos UI framework._
_Update Feb 14th, 2021: Implemented Logos UI framework, added Makefile._

This is a still a work in a progress, though much of the structure of the interpreter
and AST have taken place. Work is ongoing now to demonstrate the Realm concept before
Expand All @@ -26,10 +26,11 @@ continuing to make the tests/files/\*.go tests pass.
Make sure you have >=[go1.15](https://golang.org/doc/install) installed, and then try this:

```bash
> git clone [email protected]:gnolang/gno.git
> cd gno
> go mod download github.com/davecgh/go-spew
> go test tests/*.go -v -run="Test/realm.go"
git clone [email protected]:gnolang/gno.git
cd gno
make
cd build
./gnoland
```

## Ownership
Expand Down Expand Up @@ -304,6 +305,10 @@ file does. Eventually, each function will be commented in the same manner.
You can learn a great deal from reading Gnocode, and it's recommended that
both users and developers have a look.

## Guidelines
* Jae's BDFL, this is his design.
* No dependencies on anything precompiled.

## Contact

If you can read this, the project is evolving (fast) every day. Check
Expand Down
9 changes: 8 additions & 1 deletion cmd/goscan/goscan.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@ import (
"github.com/davecgh/go-spew/spew"
)

/*
Goscan:


*/

func main() {
fset := token.NewFileSet() // positions are relative to fset

filename := os.Args[1]
filename := os.Args[1] // Take a filename as an argument.
bz, err := ioutil.ReadFile(filename)
if err != nil {
panic(err)
Expand All @@ -27,6 +33,7 @@ func main() {
}

// Print the imports from the file's AST.
// AST: https://en.wikipedia.org/wiki/Abstract_syntax_tree
spew.Dump(f)

}
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/gnolang/gno
go 1.15

require (
github.com/OpenDiablo2/OpenDiablo2 v0.0.0-20210217103502-e9c9786af1b3 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/gdamore/tcell v1.4.0
github.com/gdamore/tcell/v2 v2.1.0
Expand Down
94 changes: 94 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/JoshVarga/blast v0.0.0-20180421040937-681c804fb9f0 h1:tDnuU0igiBiQFjsvq1Bi7DpoUjqI76VVvW045vpeFeM=
github.com/JoshVarga/blast v0.0.0-20180421040937-681c804fb9f0/go.mod h1:h/5OEGj4G+fpYxluLjSMZbFY011ZxAntO98nCl8mrCs=
github.com/OpenDiablo2/OpenDiablo2 v0.0.0-20210217103502-e9c9786af1b3 h1:76Eq8UAC3xvkYNTOFVQ9OJgsu9amP9nnioPANV5Twdw=
github.com/OpenDiablo2/OpenDiablo2 v0.0.0-20210217103502-e9c9786af1b3/go.mod h1:3JsaDhsHD+3mmG/WLLct2Zy1HjXS39jsyLPFbgRkbN0=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -7,23 +15,109 @@ github.com/gnolang/tcell v1.4.0 h1:lMgIbMpvutxEsddokzHHX4/7SewlPWp9DuuBafpq0Nw=
github.com/gnolang/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0=
github.com/gnolang/tcell/v2 v2.1.0 h1:gUYsnrQP+bPYTamkKTSkBuOc86MW2+YW+8E+kjZSf+8=
github.com/gnolang/tcell/v2 v2.1.0/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2 h1:Ac1OEHHkbAZ6EUnJahF0GKcU0FjPc/V8F1DvjhKngFE=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-restruct/restruct v1.2.0-alpha h1:2Lp474S/9660+SJjpVxoKuWX09JsXHSrdV7Nv3/gkvc=
github.com/go-restruct/restruct v1.2.0-alpha/go.mod h1:KqrpKpn4M8OLznErihXTGLlsXFGeLxHUrLRRI/1YjGk=
github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gravestench/akara v0.0.0-20201014060234-a64208a7fd3c h1:WopE590cKxkcKXcOee4gPXHqtzwbarLClCaWNCdLqgI=
github.com/gravestench/akara v0.0.0-20201014060234-a64208a7fd3c/go.mod h1:fTeda1SogMg5Lkd4lXMEd/Pk/a5/gQuLGaAI2rn1PBQ=
github.com/hajimehoshi/bitmapfont/v2 v2.1.0/go.mod h1:2BnYrkTQGThpr/CY6LorYtt/zEPNzvE/ND69CRTaHMs=
github.com/hajimehoshi/ebiten/v2 v2.0.2 h1:t8HXO9hJfKlS9tNhht8Ov6xecag0gRl7AkfKgC9hcLE=
github.com/hajimehoshi/ebiten/v2 v2.0.2/go.mod h1:AbHP/SS226aFTex/izULVwW0D2AuGyqC4AVwilmRjOg=
github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
github.com/hajimehoshi/go-mp3 v0.3.1/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
github.com/hajimehoshi/oto v0.6.8 h1:yRb3EJQ4lAkBgZYheqmdH6Lr77RV9nSWFsK/jwWdTNY=
github.com/hajimehoshi/oto v0.6.8/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
github.com/jaekwon/testify v1.6.1 h1:4AtAJcR9GzXN5W4DdY7ie74iCPiJV1JJUJL90t2ZUyw=
github.com/jaekwon/testify v1.6.1/go.mod h1:Oun0RXIHI7osufabQ60i4Lqkj0GXLbqI1I7kgzBNm1U=
github.com/jakecoffman/cp v1.0.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg=
github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk=
github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg=
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=
github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac h1:kYPjbEN6YPYWWHI6ky1J813KzIq/8+Wg4TO4xU7A/KU=
github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/exp v0.0.0-20201008143054-e3b2a7f2fdc7 h1:2/QncOxxpPAdiH+E00abYw/SaQG353gltz79Nl1zrYE=
golang.org/x/exp v0.0.0-20201008143054-e3b2a7f2fdc7/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mobile v0.0.0-20200801112145-973feb4309de h1:OVJ6QQUBAesB8CZijKDSsXX7xYVtUhrkY0gwMfbi4p4=
golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10=
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201028215240-c5abc1b1d397 h1:YZ169h3kkKEXsueizzMwOT9AaiffbOa6oXSmUFJ4vxM=
golang.org/x/sys v0.0.0-20201028215240-c5abc1b1d397/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20201009162240-fcf82128ed91/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

21 changes: 21 additions & 0 deletions logos/Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Logos

Logos is the interface to Gno.

* Browser
* Text Editor
* Development environment in the spirt of emacs
* Terminal

Bootstrap from Go to Gno the same way that Go bootstrapped from GCC.

* Stitch
* Demodule

Within one community, there are many realms and each realm maps to a user / thread / goroutine.

There are many communities, and all communities enjoy full sovereignty.

Realms can be public or private.


13 changes: 9 additions & 4 deletions logos/cmd/logos.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ func main() {
}
}


// makeTestString constructs the string that is displayed to test Logos
func makeTestString() string {
s := ""
putln := func(l string) {
Expand All @@ -119,9 +121,10 @@ func makeTestString() string {
putln("Enclose: !\u20e3 (should be enclosed exclamation)")
putln("ZWJ: \U0001f9db\u200d\u2640 (female vampire)")
putln("ZWJ: \U0001f9db\u200d\u2642 (male vampire)")
putln("Family: \U0001f469\u200d\U0001f467\u200d\U0001f467 (woman girl girl)\n")
putln("Family: \U0001f469\u200d\U0001f467\u200d\U0001f467 (woman girl girl)")
// XXX why is this broken?
// putln("Region: \U0001f1fa\U0001f1f8 (USA! USA!)\n")
putln("Region: \U0001f1fa\U0001f1f8 (USA! USA!)\n")
// Perhaps bad governance broke it.
putln("")
putln("Box:")
putln(string([]rune{
Expand Down Expand Up @@ -162,15 +165,17 @@ func makeTestString() string {
return s
}


// makeTestPage gets the test string and returns a Buffered Page View, the TUI of Logos
func makeTestPage() *logos.BufferedElemView {
// make a buffered page.
ts := makeTestString()
style := logos.Style{
Padding: logos.Padding{2, 2, 2, 2},
Padding: logos.Padding{Left: 2, Top: 2, Right: 2, Bottom: 2},
Border: logos.Border{HasBorder: true},
}
// TODO width shouldn't matter.
page := logos.NewPage(ts, 84, true, style)
page := logos.NewPage(ts, 84, true, &style)
bpv := logos.NewBufferedElemView(page, logos.Size{})
return bpv
}
5 changes: 4 additions & 1 deletion logos/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -824,14 +824,15 @@ func (pd Padding) GetPadding() Padding {
return pd
}

// A border can only have width 0 or 1, and is part of the padding.
// border can only have width 0 or 1, and is part of the padding.
// Each string should represent a character of width 1.
type Border struct {
Corners [4]string // starts upper-left and clockwise, "" draws no corner.
TopLine []string // nil if no top border.
BotLine []string // nil if no bottom border.
LeftLine []string // nil if no left border.
RightLine []string // nil if no right border.
HasBorder bool // Border or no border.
}

func DefaultBorder() Border {
Expand All @@ -846,6 +847,8 @@ func DefaultBorder() Border {
BotLine: []string{string(tcell.RuneHLine)},
LeftLine: []string{string(tcell.RuneVLine)},
RightLine: []string{string(tcell.RuneVLine)},
HasBorder: true, // Border or no border.

}
}

Expand Down
2 changes: 1 addition & 1 deletion logos/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestNewPageSprint(t *testing.T) {
this is a
new string
*/
bpv := NewBufferedPageView(page, Size{})
bpv := NewBufferedElemView(page, Size{})
out := bpv.Sprint() // unrendered.
require.Equal(t, out, " \n ")
bpv.Render()
Expand Down