miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement a hash_map and swap gss over to use it, making self-compilation 10 seconds faster on my laptop. captain.sh has been extended with the ability to bootstrap over any number of git commits.

Browse Source
This commit is contained in:
Nathan Braswell
2016-04-22 02:58:14 -04:00
parent 5a7a1d3b3c
commit bfc3b72b00
4 changed files with 93 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
captain.sh
View File

@@ -1,25 +1,33 @@
#!/bin/bash #!/bin/bash
kraken="kraken" kraken="kraken"
bootstrap_commits=(cf46fb13afe66ba475db9725e9269c9c1cd3bbc3) bootstrap_commits=(cf46fb13afe66ba475db9725e9269c9c1cd3bbc3 2cd43e5a217318c70097334b3598d2924f64b362)
if [[ $1 == "clean" ]] if [[ $1 == "clean" ]]
then then
rm ${kraken} rm ${kraken}
rm ${kraken}_bac rm ${kraken}_bac
rm ${kraken}_deprecated rm ${kraken}_deprecated
rm ${kraken}_bootstrap
rm -rf bootstrap_kalypso rm -rf bootstrap_kalypso
else else
if [[ $1 == "backup" ]] if [[ $1 == "backup" ]]
then then
rm ${kraken} rm ${kraken}
fi fi
if [[ $1 == "from_old" ]]
then
rm ${kraken}
rm ${kraken}_bac
rm ${kraken}_deprecated
fi
if [[ $1 == "rebuild" ]] if [[ $1 == "rebuild" ]]
then then
rm ${kraken} rm ${kraken}
rm ${kraken}_bac rm ${kraken}_bac
rm ${kraken}_deprecated rm ${kraken}_deprecated
rm ${kraken}_bootstrap rm ${kraken}_bootstrap
rm -rf bootstrap_kalypso
fi fi
if [ -s "$kraken" ] if [ -s "$kraken" ]
@@ -32,42 +40,66 @@ else
then then
if ! [ -s "${kraken}_deprecated" ] if ! [ -s "${kraken}_deprecated" ]
then then
echo "no ${kraken}_deprecated, bootstrapping using Cephelpod and a chain of old Kalypsos" echo "no ${kraken}_deprecated, bootstrapping using kraken_bootstrap"
git clone . bootstrap_kalypso if ! [ -s "${kraken}_bootstrap" ]
pushd bootstrap_kalypso then
git checkout ${bootstrap_commits[0]} echo "no ${kraken}_bootstrap, bootstrapping using Cephelpod and a chain of old Kalypsos"
cp -r stdlib deprecated_compiler git clone . bootstrap_kalypso
cp krakenGrammer.kgm deprecated_compiler pushd bootstrap_kalypso
cp kraken.krak deprecated_compiler git checkout ${bootstrap_commits[0]}
pushd deprecated_compiler cp -r stdlib deprecated_compiler
mkdir build cp krakenGrammer.kgm deprecated_compiler
pushd build cp kraken.krak deprecated_compiler
cmake .. pushd deprecated_compiler
make mkdir build
popd pushd build
mkdir build_kraken cmake ..
mv kraken.krak build_kraken make
pushd build_kraken popd
../build/kraken kraken.krak mkdir build_kraken
popd mv kraken.krak build_kraken
popd pushd build_kraken
pushd deprecated_compiler/build_kraken/kraken ../build/kraken kraken.krak
sh kraken.sh popd
popd popd
cp deprecated_compiler/build_kraken/kraken/kraken ../${kraken}_bootstrap pushd deprecated_compiler/build_kraken/kraken
popd sh kraken.sh
# Now make popd
cp deprecated_compiler/build_kraken/kraken/kraken ./${kraken}_bootstrap
# loop through the chain
for ((i=1; i < ${#bootstrap_commits[@]}; i++))
do
echo "building kalypso bootstrap part $i"
echo "commit hash: ${bootstrap_commits[$i]}"
mv ./krakenGrammer.kgm krakenGrammer.kgm_old
git checkout ${bootstrap_commits[$i]}
mv ./krakenGrammer.kgm krakenGrammer.kgm_new
mv ./krakenGrammer.kgm_old krakenGrammer.kgm
./${kraken}_bootstrap kraken.krak ${kraken}_bootstrap
mv ./krakenGrammer.kgm_new krakenGrammer.kgm
done
popd # out of bootstrap
fi
echo "making kraken_deprecated - the first current Kraken version, but built with an old compiler"
# Now make real
mv ./krakenGrammer.kgm krakenGrammer.kgm_new mv ./krakenGrammer.kgm krakenGrammer.kgm_new
mv ./krakenGrammer.kgm.comp_new krakenGrammer.kgm.comp_new_new
cp bootstrap_kalypso/krakenGrammer.kgm ./ cp bootstrap_kalypso/krakenGrammer.kgm ./
cp bootstrap_kalypso/krakenGrammer.kgm.comp_new ./
cp bootstrap_kalypso/${kraken}_bootstrap ./${kraken}_bootstrap
./${kraken}_bootstrap kraken.krak ${kraken}_deprecated ./${kraken}_bootstrap kraken.krak ${kraken}_deprecated
mv ./krakenGrammer.kgm_new krakenGrammer.kgm mv ./krakenGrammer.kgm_new krakenGrammer.kgm
mv ./krakenGrammer.kgm.comp_new_new krakenGrammer.kgm.comp_new
else else
echo "${kraken}_deprecated exists, calling" echo "${kraken}_deprecated exists, calling"
fi fi
echo "making kraken_bac, a current compiler built with kraken_deprecated"
./${kraken}_deprecated kraken.krak ${kraken}_bac ./${kraken}_deprecated kraken.krak ${kraken}_bac
else else
echo "${kraken}_bac exists, calling" echo "${kraken}_bac exists, calling"
fi fi
echo "making kraken, the real current compiler built with kraken_bac"
./${kraken}_bac kraken.krak ${kraken} ./${kraken}_bac kraken.krak ${kraken}
fi fi
fi fi

41
stdlib/hash_map.krak
View File

@@ -22,17 +22,29 @@ obj hash_map<T,U> (Object, Serializable) {
data.construct() data.construct()
data.add(map::map<T,U>()) data.add(map::map<T,U>())
size = 0 size = 0
/*io::print("Constructed hash_map, this: ")*/
/*io::println((this) cast int)*/
/*io::print("size of data:")*/
/*io::println(data.size)*/
return this return this
} }
fun copy_construct(old: *hash_map<T,U>) { fun copy_construct(old: *hash_map<T,U>) {
data.copy_construct(&old->data) data.copy_construct(&old->data)
size = old->size size = old->size
/*io::print("Copy constructed hash_map, this: ")*/
/*io::println((this) cast int)*/
/*io::print("new size of data:")*/
/*io::println(data.size)*/
/*io::print("old size of data:")*/
/*io::println(old->data.size)*/
} }
fun operator=(rhs: hash_map<T,U>) { fun operator=(rhs: hash_map<T,U>) {
destruct() destruct()
copy_construct(&rhs) copy_construct(&rhs)
} }
fun destruct() { fun destruct() {
/*io::print("destructed hash_map, this: ")*/
/*io::println((this) cast int)*/
data.destruct() data.destruct()
} }
fun serialize(): vector::vector<char> { fun serialize(): vector::vector<char> {
@@ -49,19 +61,26 @@ obj hash_map<T,U> (Object, Serializable) {
return data == other.data return data == other.data
} }
fun set(key: T, value: U) { fun set(key: T, value: U) {
/*io::print("doing set! this:")*/
/*io::println((this) cast int)*/
/*io::print("size of data:")*/
/*io::println(data.size)*/
var key_hash = util::hash(key) var key_hash = util::hash(key)
if (!data[key_hash%data.size].contains_key(key)) if (!data[key_hash%data.size].contains_key(key)) {
size++ size++
data[key_hash%data.size].set(key, value) if (size > data.size) {
if (size > data.size) { /*io::print("rehashing to: ")*/
var new_data = vector::vector<map::map<T,U>>() /*io::println(size*2)*/
for (var i = 0; i < size*2; i++;) var new_data = vector::vector<map::map<T,U>>()
new_data.addEnd(map::map<T,U>()) for (var i = 0; i < size*2; i++;)
for_each(fun(key: T, value: U) { new_data.addEnd(map::map<T,U>())
new_data[util::hash(key)%new_data.size].set(key, value) for_each(fun(key: T, value: U) {
}) new_data[util::hash(key)%new_data.size].set(key, value)
data = new_data })
data = new_data
}
} }
data[key_hash%data.size].set(key, value)
} }
fun get(key: T): ref U { fun get(key: T): ref U {
return data[util::hash(key)%data.size].get(key) return data[util::hash(key)%data.size].get(key)
@@ -103,6 +122,8 @@ obj hash_map<T,U> (Object, Serializable) {
} }
fun clear() { fun clear() {
data.clear() data.clear()
size = 0
data.add(map::map<T,U>())
} }
} }

4
stdlib/parser.krak
View File

@@ -405,8 +405,8 @@ obj parser (Object) {
obj gss (Object) { obj gss (Object) {
var data: vector<vector<*tree<int>>> var data: vector<vector<*tree<int>>>
var edges: map< pair<*tree<int>, *tree<int>>, *tree<symbol> > /*var edges: map< pair<*tree<int>, *tree<int>>, *tree<symbol> >*/
/*var edges: hash_map< pair<*tree<int>, *tree<int>>, *tree<symbol> >*/ var edges: hash_map< pair<*tree<int>, *tree<int>>, *tree<symbol> >
fun construct(): *gss { fun construct(): *gss {
data.construct() data.construct()

4
stdlib/util.krak
View File

@@ -95,8 +95,8 @@ obj pair<T,U> (Object, Serializable, Hashable) {
return second_pair.second return second_pair.second
} }
/*fun hash():int return hash(first) ^ hash(second)*/ fun hash():int return hash(first) ^ hash(second)
fun hash():int return 0 /*fun hash():int return 0*/
// the old unnecessary template to prevent generation // the old unnecessary template to prevent generation
// if not used trick (in this case, changing out U with V) // if not used trick (in this case, changing out U with V)