Permalink
Browse files

Undoing stuff..

  • Loading branch information...
1 parent 9940ccf commit 7801a44edee5867c8393c35ae1e9919fee9370f5 Amos Wenger committed Jun 7, 2012
Showing with 3 additions and 18 deletions.
  1. +2 −17 source/rock/middle/ClassDecl.ooc
  2. +1 −1 source/rock/middle/TypeDecl.ooc
@@ -196,18 +196,7 @@ ClassDecl: class extends TypeDecl {
if (!response ok()) return response
}
- finalResponse := Response OK
- specializations each(|k, specialized|
- "===================== resolving specialization =============" println()
- response := specialized resolve(trail, res)
- if (!response ok()) finalResponse = response
-
- response = specialized getMeta() resolve(trail, res)
- if (!response ok()) finalResponse = response
- "===================== resolving done =============" println()
- )
-
- return finalResponse
+ return Response OK
}
writeSize: func (w: TabbedWriter, instance: Bool) {
@@ -429,11 +418,7 @@ ClassDecl: class extends TypeDecl {
}
toString: func -> String {
- if (isSpecialized()) {
- super() + " (specialized)"
- } else {
- super()
- }
+ super()
}
}
@@ -386,7 +386,7 @@ TypeDecl: abstract class extends Declaration {
)
if (bestScore > 0) {
- "[special] best spe is %s, resolving there instead" printfln(bestSpe)
+ "[special] best spe is %s, resolving there instead" printfln(bestSpe toString())
return bestSpe getMeta() getFunction(name, suffix, call, true, 0, null, finalScore&)
}
}

0 comments on commit 7801a44

Please sign in to comment.