From 5c7ae1407425d8a595ea8841b669e30e61e29307 Mon Sep 17 00:00:00 2001
From: Daniil Yarancev <TiberiumN@users.noreply.github.com>
Date: Mon, 14 Aug 2017 18:43:39 +0300
Subject: [PATCH] Fixes #5965 (#6237)

---
 compiler/semobjconstr.nim      |  7 ++++++-
 tests/constructors/t5965_1.nim | 10 ++++++++++
 tests/constructors/t5965_2.nim | 10 ++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 tests/constructors/t5965_1.nim
 create mode 100644 tests/constructors/t5965_2.nim

diff --git a/compiler/semobjconstr.nim b/compiler/semobjconstr.nim
index f4c2255269..b331d05a15 100644
--- a/compiler/semobjconstr.nim
+++ b/compiler/semobjconstr.nim
@@ -44,7 +44,9 @@ proc locateFieldInInitExpr(field: PSym, initExpr: PNode): PNode =
   let fieldId = field.name.id
   for i in 1 .. <initExpr.len:
     let assignment = initExpr[i]
-    internalAssert assignment.kind == nkExprColonExpr
+    if assignment.kind != nkExprColonExpr:
+      localError(initExpr.info, "incorrect object construction syntax")
+      continue
 
     if fieldId == considerQuotedIdent(assignment[0]).id:
       return assignment
@@ -278,6 +280,9 @@ proc semObjConstr(c: PContext, n: PNode, flags: TExprFlags): PNode =
   for i in 1.. <result.len:
     let field = result[i]
     if nfSem notin field.flags:
+      if field.kind != nkExprColonExpr:
+        localError(n.info, "incorrect object construction syntax")
+        continue
       let id = considerQuotedIdent(field[0])
       # This node was not processed. There are two possible reasons:
       # 1) It was shadowed by a field with the same name on the left
diff --git a/tests/constructors/t5965_1.nim b/tests/constructors/t5965_1.nim
new file mode 100644
index 0000000000..9f947f859f
--- /dev/null
+++ b/tests/constructors/t5965_1.nim
@@ -0,0 +1,10 @@
+discard """
+  file: "t5965_1.nim"
+  line: 10
+  errormsg: "incorrect object construction syntax"
+"""
+
+type Foo = object
+  a, b, c: int
+
+discard Foo(a: 1, 2)
diff --git a/tests/constructors/t5965_2.nim b/tests/constructors/t5965_2.nim
new file mode 100644
index 0000000000..a3f7174c92
--- /dev/null
+++ b/tests/constructors/t5965_2.nim
@@ -0,0 +1,10 @@
+discard """
+  file: "t5965_2.nim"
+  line: 10
+  errormsg: "incorrect object construction syntax"
+"""
+
+type Foo = object
+  a: int
+
+discard Foo(a: 1, 2)