Merge pull request #18 from timotheecour/pr_fix_32bit_builds

fix 32bit builds
This commit is contained in:
genotrance 2018-11-27 19:50:05 -06:00 • committed by GitHub
commit b8b56f4ed2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 21 deletions

View file

@ -1,25 +1,31 @@
sudo: false
language: c
os: os:
- linux - linux
- osx - osx
dist: trusty
before_script: language: c
- 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/'` env:
- export TXZ=`cat latest.json | grep '"name":' | sed -E 's/.*"([^"]+)".*/\1/' | grep linux | tail -n 1` # test against both stable & devel
- export VERSION=`echo $TXZ | cut -d"-" -f 2,2` - BRANCH=stable
- echo "RELEASE = $RELEASE, TXZ = $TXZ, VERSION = $VERSION" - BRANCH=devel
- curl -L --silent -o $TXZ "https://github.com/nim-lang/nightlies/releases/download/$RELEASE/$TXZ"
- tar xf $TXZ cache:
- cd nim-$VERSION directories:
- sh build.sh - "$HOME/.nimble"
- bin/nim c koch - "$HOME/.choosenim"
- ./koch boot -d:release
- ./koch nimble matrix:
- export PATH=$(pwd)/bin:~/.nimble/bin:$PATH allow_failures:
- cd .. - 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: script:
- nimble installWithDeps - nimble installWithDeps

View file

@ -14,7 +14,7 @@ type
Ast* = object Ast* = object
sym*: Sym sym*: Sym
start*, stop*: uint32 start*, stop*: int
parent*: ref Ast parent*: ref Ast
children*: seq[ref Ast] children*: seq[ref Ast]

View file

@ -41,8 +41,8 @@ proc readFromTokens(): ref Ast =
result.sym = parseEnum[Sym](gTokens[idx+1]) result.sym = parseEnum[Sym](gTokens[idx+1])
except: except:
result.sym = IGNORED result.sym = IGNORED
result.start = gTokens[idx+2].parseInt().uint32 result.start = gTokens[idx+2].parseInt()
result.stop = gTokens[idx+3].parseInt().uint32 result.stop = gTokens[idx+3].parseInt()
result.children = @[] result.children = @[]
idx += 4 idx += 4
while gTokens[idx] != ")": while gTokens[idx] != ")":