From bd3f6b51d0be7e8cc360e32b778086c5326a8eca Mon Sep 17 00:00:00 2001
From: enurlyx <enurlyx@gmail.com>
Date: Sun, 15 Jun 2014 22:18:17 +0200
Subject: Sorting enumerations and generation of consts for enumfields with the
 same value + test

---
 compiler/c2nim/tests/enum.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 compiler/c2nim/tests/enum.h

(limited to 'compiler/c2nim/tests/enum.h')

diff --git a/compiler/c2nim/tests/enum.h b/compiler/c2nim/tests/enum.h
new file mode 100644
index 000000000..c9c055e14
--- /dev/null
+++ b/compiler/c2nim/tests/enum.h
@@ -0,0 +1,27 @@
+
+enum vehicles
+{
+	car = 0x10,
+	truck,
+	boat = 0x01,
+	ship = 1,
+	speedboat = 1,
+	bicycle = 4,
+	bobycar
+};
+
+enum
+{
+	red = 4,
+	green = 2,
+	blue
+};
+
+typedef enum food
+{
+	bread = 4,
+	toast = 4,
+	bun = 0x04,
+	cucumber = 2,
+	chocolate = 6
+};
\ No newline at end of file
-- 
cgit 1.4.1-2-gfad0


From 2940aa5ee200354f2bfd06eddbe51a16a7397d3d Mon Sep 17 00:00:00 2001
From: enurlyx <enurlyx@gmail.com>
Date: Tue, 17 Jun 2014 21:42:16 +0200
Subject: Made the code more robust and detect nkPrefix as number (-1 or +4)
 for enum sorting. Added also a new test for enums.

---
 compiler/c2nim/cparse.nim   | 50 +++++++++++++++++++++++++++++++++++++--------
 compiler/c2nim/tests/enum.h | 13 ++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

(limited to 'compiler/c2nim/tests/enum.h')

diff --git a/compiler/c2nim/cparse.nim b/compiler/c2nim/cparse.nim
index cbfe23a44..2e31af528 100644
--- a/compiler/c2nim/cparse.nim
+++ b/compiler/c2nim/cparse.nim
@@ -919,11 +919,23 @@ proc createConst(name, typ, val: PNode, p: TParser): PNode =
   result = newNodeP(nkConstDef, p)
   addSon(result, name, typ, val)
 
+proc exprToNumber(n: PNode not nil): tuple[succ: bool, val: BiggestInt] =
+  result = (false, 0.BiggestInt)
+  case n.kind:
+  of nkPrefix:
+    # Check for negative/positive numbers  -3  or  +6
+    if n.sons.len == 2 and n.sons[0].kind == nkIdent and n.sons[1].kind == nkIntLit:
+      let pre = n.sons[0]
+      let num = n.sons[1]
+      if pre.ident.s == "-": result = (true, - num.intVal)
+      elif pre.ident.s == "+": result = (true, num.intVal)
+  else: discard
+
 proc enumFields(p: var TParser, constList: PNode): PNode = 
   result = newNodeP(nkEnumTy, p)
   addSon(result, ast.emptyNode) # enum does not inherit from anything
   var i: BiggestInt = 0
-  var field: tuple[id: BiggestInt, node: PNode]
+  var field: tuple[id: BiggestInt, isNumber: bool, node: PNode]
   var fields = newSeq[type(field)]()
   while true:
     var e = skipIdent(p)
@@ -934,9 +946,19 @@ proc enumFields(p: var TParser, constList: PNode): PNode =
       e = newNodeP(nkEnumFieldDef, p)
       addSon(e, a, c)
       skipCom(p, e)
-      i = c.intVal
+      if c.kind == nkIntLit:
+        i = c.intVal
+        field.isNumber = true
+      else:
+        var (success, number) = exprToNumber(c)
+        if success:
+          i = number
+          field.isNumber = true
+        else:
+          field.isNumber = false
     else:
       inc(i)
+      field.isNumber = true
     field.id = i
     field.node = e
     fields.add(field)
@@ -946,22 +968,32 @@ proc enumFields(p: var TParser, constList: PNode): PNode =
     if p.tok.xkind == pxCurlyRi: break
   fields.sort do (x, y: type(field)) -> int:
     cmp(x.id, y.id)
-  var lastId: BiggestInt = -1
+  var lastId: BiggestInt
   var lastIdent: PNode
-  for f in fields:
-    if f.id == lastId:
+  for count, f in fields:
+    if not f.isNumber:
+      addSon(result, f.node)
+    elif f.id == lastId and count > 0:
       var currentIdent: PNode
       case f.node.kind:
-      of nkEnumFieldDef: currentIdent = f.node.sons[0]
-      else: currentIdent = f.node
+      of nkEnumFieldDef:
+        if f.node.sons.len > 0 and f.node.sons[0].kind == nkIdent:
+          currentIdent = f.node.sons[0]
+        else: parMessage(p, errGenerated, "Warning: When sorting enum fields an expected nkIdent was not found. Check the fields!")
+      of nkIdent: currentIdent = f.node
+      else: parMessage(p, errGenerated, "Warning: When sorting enum fields an expected nkIdent was not found. Check the fields!")
       var constant = createConst( currentIdent, ast.emptyNode, lastIdent, p)
       constList.addSon(constant)
     else:
       addSon(result, f.node)
       lastId = f.id
       case f.node.kind:
-      of nkEnumFieldDef: lastIdent = f.node.sons[0]
-      else: lastIdent = f.node
+      of nkEnumFieldDef:
+        if f.node.sons.len > 0 and f.node.sons[0].kind == nkIdent:
+          lastIdent = f.node.sons[0]
+        else: parMessage(p, errGenerated, "Warning: When sorting enum fields an expected nkIdent was not found. Check the fields!")
+      of nkIdent: lastIdent = f.node
+      else: parMessage(p, errGenerated, "Warning: When sorting enum fields an expected nkIdent was not found. Check the fields!")
 
 proc parseTypedefStruct(p: var TParser, result: PNode, stmtList: PNode, isUnion: bool) = 
   getTok(p, result)
diff --git a/compiler/c2nim/tests/enum.h b/compiler/c2nim/tests/enum.h
index c9c055e14..16bc59058 100644
--- a/compiler/c2nim/tests/enum.h
+++ b/compiler/c2nim/tests/enum.h
@@ -24,4 +24,17 @@ typedef enum food
 	bun = 0x04,
 	cucumber = 2,
 	chocolate = 6
+};
+
+typedef enum numbers
+{
+	one = 1,
+	two,
+	nten = - 10,
+	nnine,
+	four = 4,
+	three = + 3,
+	positivenine = + 9,
+	nfour = - 4,
+	negativeten = -10
 };
\ No newline at end of file
-- 
cgit 1.4.1-2-gfad0