diff options
| author | genotrance <dev@genotrance.com> | 2018-11-27 19:50:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 19:50:05 -0600 |
| commit | b8b56f4ed2deeee17cf331a93ef4b51068cd1ee9 (patch) | |
| tree | 5a3763cc6e6ec6ba90aa7f547035c1d64e96b26a | |
| parent | 51180f63738ad6cb1a3b621b1ad35de5a3f19fc5 (diff) | |
| parent | e7f58adc4963de57efc617a1cc11b22f6563bdf2 (diff) | |
| download | nimterop-b8b56f4ed2deeee17cf331a93ef4b51068cd1ee9.tar.gz nimterop-b8b56f4ed2deeee17cf331a93ef4b51068cd1ee9.zip | |
Merge pull request #18 from timotheecour/pr_fix_32bit_builds
fix 32bit builds
| -rw-r--r-- | .travis.yml | 42 | ||||
| -rw-r--r-- | nimterop/globals.nim | 2 | ||||
| -rw-r--r-- | nimterop/lisp.nim | 4 |
3 files changed, 27 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index ca42600..60eabe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,31 @@ -sudo: false -language: c os: - linux - osx -dist: trusty -before_script: - - curl -u $TOKEN -o latest.json --silent https://api.github.com/repos/nim-lang/nightlies/releases/latest - - export RELEASE=`cat latest.json | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/'` - - export TXZ=`cat latest.json | grep '"name":' | sed -E 's/.*"([^"]+)".*/\1/' | grep linux | tail -n 1` - - export VERSION=`echo $TXZ | cut -d"-" -f 2,2` - - echo "RELEASE = $RELEASE, TXZ = $TXZ, VERSION = $VERSION" - - curl -L --silent -o $TXZ "https://github.com/nim-lang/nightlies/releases/download/$RELEASE/$TXZ" - - tar xf $TXZ - - cd nim-$VERSION - - sh build.sh - - bin/nim c koch - - ./koch boot -d:release - - ./koch nimble - - export PATH=$(pwd)/bin:~/.nimble/bin:$PATH - - cd .. +language: c + +env: + # test against both stable & devel + - BRANCH=stable + - BRANCH=devel + +cache: + directories: + - "$HOME/.nimble" + - "$HOME/.choosenim" + +matrix: + allow_failures: + - env: BRANCH=devel + fast_finish: true + +install: + - export CHOOSENIM_CHOOSE_VERSION=$BRANCH + - | + curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh + sh init.sh -y + - export PATH=$HOME/.nimble/bin:$PATH + - nimble refresh -y script: - nimble installWithDeps diff --git a/nimterop/globals.nim b/nimterop/globals.nim index ae3d03b..8797af8 100644 --- a/nimterop/globals.nim +++ b/nimterop/globals.nim @@ -14,7 +14,7 @@ type Ast* = object sym*: Sym - start*, stop*: uint32 + start*, stop*: int parent*: ref Ast children*: seq[ref Ast] diff --git a/nimterop/lisp.nim b/nimterop/lisp.nim index 36c810a..44d609f 100644 --- a/nimterop/lisp.nim +++ b/nimterop/lisp.nim @@ -41,8 +41,8 @@ proc readFromTokens(): ref Ast = result.sym = parseEnum[Sym](gTokens[idx+1]) except: result.sym = IGNORED - result.start = gTokens[idx+2].parseInt().uint32 - result.stop = gTokens[idx+3].parseInt().uint32 + result.start = gTokens[idx+2].parseInt() + result.stop = gTokens[idx+3].parseInt() result.children = @[] idx += 4 while gTokens[idx] != ")": |