Updates for more recent (v1.6.0) nim.
--- a/src/tnetstring.nim Mon Oct 08 12:53:05 2018 -0700
+++ b/src/tnetstring.nim Wed Oct 27 10:09:51 2021 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015-2018, Mahlon E. Smith <mahlon@martini.nu>
+# Copyright (c) 2015-2021, Mahlon E. Smith <mahlon@martini.nu>
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -97,8 +97,6 @@
parseutils,
strutils
-const version = "0.1.2"
-
type
TNetstringKind* = enum ## enumeration of all valid types
TNetstringString, ## a string literal
@@ -138,50 +136,37 @@
proc newTNetstringString*( s: string ): TNetstringNode =
## Create a new String typed TNetstringNode.
- new( result )
- result.kind = TNetstringString
- result.str = s
+ result = TNetstringNode( kind: TNetstringString, str: s )
proc newTNetstringInt*( i: BiggestInt ): TNetstringNode =
## Create a new Integer typed TNetstringNode.
- new( result )
- result.kind = TNetstringInt
- result.num = i
+ result = TNetstringNode( kind: TNetstringInt, num: i )
proc newTNetstringFloat*( f: float ): TNetstringNode =
## Create a new Float typed TNetstringNode.
- new( result )
- result.kind = TNetstringFloat
- result.fnum = f
+ result = TNetstringNode( kind: TNetstringFloat, fnum: f )
proc newTNetstringBool*( b: bool ): TNetstringNode =
## Create a new Boolean typed TNetstringNode.
- new( result )
- result.kind = TNetstringBool
- result.bval = b
+ result = TNetstringNode( kind: TNetstringBool, bval: b )
proc newTNetstringNull*(): TNetstringNode =
## Create a new nil typed TNetstringNode.
- new( result )
- result.kind = TNetstringNull
+ result = TNetstringNode( kind: TNetstringNull )
proc newTNetstringObject*(): TNetstringNode =
## Create a new Object typed TNetstringNode.
- new( result )
- result.kind = TNetstringObject
- result.fields = @[]
+ result = TNetstringNode( kind: TNetstringObject, fields: @[] )
proc newTNetstringArray*(): TNetstringNode =
## Create a new Array typed TNetstringNode.
- new( result )
- result.kind = TNetstringArray
- result.elems = @[]
+ result = TNetstringNode( kind: TNetstringArray, elems: @[] )
proc getStr*( node: TNetstringNode, default: string = "" ): string =
@@ -245,7 +230,7 @@
payload = data[ sep_pos + 1 .. sep_pos + length ]
extra = data[ sep_pos + length + 2 .. ^1 ]
- except ValueError, IndexError:
+ except ValueError, IndexDefect:
var msg = getCurrentExceptionMsg()
raiseParseErr( result, msg )
@@ -384,9 +369,7 @@
proc copy*( node: TNetstringNode ): TNetstringNode =
## Perform a deep copy of TNetstringNode.
- new( result )
- result.kind = node.kind
- result.extra = node.extra
+ result = TNetstringNode( kind: node.kind, extra: node.extra )
case node.kind
of TNetstringString:
@@ -416,7 +399,7 @@
if node.fields[i].key == key:
node.fields.delete( i )
return
- raise newException( IndexError, "key not in object" )
+ raise newException( IndexDefect, "key not in object" )
proc hash*( node: TNetstringNode ): Hash =
--- a/tnetstring.nimble Mon Oct 08 12:53:05 2018 -0700
+++ b/tnetstring.nimble Wed Oct 27 10:09:51 2021 -0700
@@ -1,7 +1,7 @@
# Package
-version = "0.1.2"
+version = "0.1.3"
author = "Mahlon E. Smith <mahlon@martini.nu>"
description = "Parsing and serializing for the TNetstring format."
license = "MIT"
@@ -11,5 +11,5 @@
# Dependencies
-requires "nim >= 0.19.0"
+requires "nim >= 1.4.0"