Permalink
Browse files

Fixed a sneaky bug where some functions would appear twice

  • Loading branch information...
1 parent 24db849 commit 50903d964d8acabe09c94bdd2ea266698c7fcb4d Amos Wenger committed May 3, 2012
Showing with 11 additions and 1 deletion.
  1. +8 −0 build-snow.sh
  2. +3 −1 source/rock/backend/cnaughty/ClassDeclWriter.ooc
View
8 build-snow.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -rf snowflake
+ROCK_SDK=$PWD/sdk make self
+rm -f snowflake/Makefile
+cp /tmp/Makefile.bak snowflake/Makefile
+cd snowflake && ROCK_DIST=~/rock/ make -j8 && ./rock -V
+
View
4 source/rock/backend/cnaughty/ClassDeclWriter.ooc
@@ -96,7 +96,9 @@ ClassDeclWriter: abstract class extends Skeleton {
if(cDecl getSuperRef() != null) {
superDecl : FunctionDecl = null
- superDecl = cDecl getSuperRef() lookupFunction(fDecl name, fDecl suffix)
+ finalScore := 0
+ superDecl = cDecl getSuperRef() getFunction(fDecl name, fDecl suffix, finalScore&)
+
// don't write the function if it was declared in the parent
if(superDecl != null) {
//printf("Already declared in super %s, skipping (superDecl = %s)\n", cDecl getSuperRef() toString(), superDecl toString())

0 comments on commit 50903d9

Please sign in to comment.