second attempt to fix code gen for pegs.nim

2 files changed, 1 insertions, 5 deletions

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index 2b84226d3..38cfafcfa 100755
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -499,8 +499,7 @@ proc unaryArith(p: BProc, e: PNode, d: var TLoc, op: TMagic) =
 
 proc genDeref(p: BProc, e: PNode, d: var TLoc) =
   var a: TLoc
-  if mapType(e.sons[0].typ) == ctArray and
-      skipTypes(e.sons[0].typ.sons[0], abstractInst).kind != tySet:
+  if mapType(e.sons[0].typ) == ctArray:
     # XXX the amount of hacks for C's arrays is incredible, maybe we should
     # simply wrap them in a struct? --> Losing auto vectorization then?
     expr(p, e.sons[0], d)
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 47828514e..cb4589bca 100755
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -94,9 +94,6 @@ proc mapType(typ: PType): TCTypeKind =
     var base = skipTypes(typ.sons[0], abstractInst)
     case base.kind
     of tyOpenArray, tyArrayConstr, tyArray: result = ctArray
-    of tySet:
-      result = mapSetType(base)
-      if result != ctArray: result = ctPtr
     else: result = ctPtr
   of tyPointer: result = ctPtr
   of tySequence: result = ctNimSeq