Merge branch 'develop' into typed_function_ordering

2016-12-05 19:19:41 -07:00 · 2016-10-26 14:33:33 -06:00 · 2016-04-20 06:41:37 -06:00 · 2016-03-15 12:46:47 -06:00 · 2016-03-11 15:00:28 -07:00 · 2016-03-04 13:33:29 -07:00
57 changed files with 1154 additions and 1147 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,56 +1,33 @@
 language: cpp
-
-
-addons:
-  apt:
-    sources: 
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.9
-      - g++-5
-  coverity_scan:
-    project:
-      name: "ChaiScript/ChaiScript"
-      description: "Build submitted via Travis CI"
-    notification_email: jason@emptycrate.com
-    build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
-    build_command:   "cmake --build . -- -j2"
-    branch_pattern: coverity_scan
-      
-matrix:
-  include:
-    - os: linux
-      sudo: false
-      env: GCC_VER="4.9"
-      compiler: gcc
-    - os: linux
-      sudo: false
-      env: GCC_VER="5"
-      compiler: gcc
-    - os: osx
-      compiler: clang
-      osx_image: xcode8
-
-  
+compiler:
+  - gcc
 env:
+  matrix:
+    - GCC_VER="4.9"
+    - GCC_VER="5"
+
  global:
    - secure: eiaR6pXiiEpyB8+LLQ1NvZdl0Yylru1BLy9lMoHl+IpUNGGQGywmW/2WAn77rFfmR1OPA2qWQLfgPwgK0HxUA9HHlot9tre5QhiN2Lw8NOT8tCZ6tTm2+QntDBjBGJyal/knRvQkn/6qs6GxlXRerz4ArnnuPL1vESt3zwB0YtU=
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    - secure: "LfolGjP8tWm3yAwthfu3yp8Zn40aueFae580UUR34gusG87cyglq2tQDtxdy+63gWEeNfArbv9n5rZv+bDW3ggHyPjuCKKc1PlZAy07lfXUXf1uz+SFhNvNoYTn3mQG3VZ08o116p4Le2p8yqu4bylJ8wckEq7PrTwvSGVQWTWM="

 before_install:
-  - if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi
-  - if [ "${GCC_VER}" == "5" ]; then export CPPCHECK=1 COVERAGE=1 FUZZY_CMD="-D RUN_FUZZY_TESTS:BOOL=TRUE" ; fi
-  - pip install --user cpp-coveralls
+  - export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER"
+  - if [ "$GCC_VER" = "5" ]; then export COVERAGE=1 CPPCHECK=1; fi
+  - if [ ${COVERAGE} = 1 ]; then export FUZZY_CMD="-D RUN_FUZZY_TESTS:BOOL=TRUE"; fi
+  - sudo pip install cpp-coveralls
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  - sudo apt-get update
+  - sudo apt-get install -qq g++-$GCC_VER

 script: 
-  - cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug $FUZZY_CMD . 
-  - cmake --build . -- -j2
-  - ctest
+  - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug $FUZZY_CMD . ; fi
+  - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make -j2 ; fi
+  - make test
  - if [ ${COVERAGE} = 1 ]; then bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -x $GCOV -a "-s `pwd`" ; fi

-#after_script:
-#  - if [ ${CPPCHECK} = 1 ]; then contrib/codeanalysis/runcppcheck.sh ; fi
+after_script:
+  - if [ ${CPPCHECK} = 1 ]; then contrib/codeanalysis/runcppcheck.sh ; fi


 notifications:
@@ -65,3 +42,15 @@ notifications:
    on_success: change  # options: [always|never|change] default: always
    on_failure: always  # options: [always|never|change] default: always
    on_start: false     # default: false
+
+addons:
+  coverity_scan:
+    project:
+      name: "ChaiScript/ChaiScript"
+      description: "Build submitted via Travis CI"
+    notification_email: jason@emptycrate.com
+    build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
+    build_command:   "cmake --build . -- -j2"
+    branch_pattern: coverity_scan
+
+
--- a/contrib/codeanalysis/runcppcheck.sh
+++ b/contrib/codeanalysis/runcppcheck.sh
@@ -4,7 +4,7 @@ pushd ..
 wget http://sourceforge.net/projects/cppcheck/files/cppcheck/1.66/cppcheck-1.66.tar.bz2
 tar -xvf cppcheck-1.66.tar.bz2
 cd cppcheck-1.66
-make -j2
+CXX=g++-4.8 make -j2
 popd
 ../cppcheck-1.66/cppcheck --enable=all -I include --inline-suppr --suppress=missingIncludeSystem --std=c++11 --platform=unix64 src/main.cpp src/chai*.cpp --template ' - __{severity}__: [{file}:{line}](../blob/TRAVIS_COMMIT/{file}#L{line}) {message} ({id})'  2>output
 sed -i "s/TRAVIS_COMMIT/${TRAVIS_COMMIT}/g" output
--- a/contrib/sublimetext/ChaiScript.YAML-tmLanguage
+++ b/contrib/sublimetext/ChaiScript.YAML-tmLanguage
@@ -0,0 +1,93 @@
+# [PackageDev] target_format: plist, ext: tmLanguage
+---
+comment: 'ChaiScript Syntax: version 2.0'
+fileTypes: [chai]
+firstLineMatch: ^#!/usr/bin/env node
+foldingStartMarker: ^.*\bdef\s*(\w+\s*)?\([^\)]*\)(\s*\{[^\}]*)?\s*$
+foldingStopMarker: ^\s*\}
+keyEquivalent: ^~J
+name: ChaiScript
+patterns:
+- {comment: chaiscript shebang, match: ^#, name: comment.line.chai}
+- {match: '\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b', name: constant.numeric.chai}
+- begin: ''''
+  beginCaptures:
+    '0': {name: punctuation.definition.string.begin.chai}
+  end: ''''
+  endCaptures:
+    '0': {name: punctuation.definition.string.end.chai}
+  name: string.quoted.single.chai
+  patterns:
+  - {match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)', name: constant.character.escape.chai}
+- begin: '"'
+  beginCaptures:
+    '0': {name: punctuation.definition.string.begin.chai}
+  end: '"'
+  endCaptures:
+    '0': {name: punctuation.definition.string.end.chai}
+  name: string.quoted.double.chai
+  patterns:
+  - {match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)', name: constant.character.escape.chai}
+- begin: /\*\*(?!/)
+  captures:
+    '0': {name: punctuation.definition.comment.chai}
+  end: \*/
+  name: comment.block.documentation.chai
+- begin: /\*
+  captures:
+    '0': {name: punctuation.definition.comment.chai}
+  end: \*/
+  name: comment.block.chai
+- captures:
+    '1': {name: punctuation.definition.comment.chai}
+  match: (//).*$\n?
+  name: comment.line.double-slash.chai
+- captures:
+    '0': {name: punctuation.definition.comment.html.chai}
+    '2': {name: punctuation.definition.comment.html.chai}
+  match: (<!--|-->)
+  name: comment.block.html.chai
+- {match: \b(boolean|byte|char|class|double|enum|float|fun|def|int|interface|long|short|var|auto|attr)\b,
+  name: storage.type.chai}
+- {match: \b(break|case|catch|continue|default|do|else|finally|else if|for|goto|if|return|switch|throw|try|while)\b,
+  name: keyword.control.chai}
+- {match: \b(delete|in|instanceof|new|typeof|with)\b, name: keyword.operator.chai}
+- {match: \btrue\b, name: constant.language.boolean.true.chai}
+- {match: \bfalse\b, name: constant.language.boolean.false.chai}
+- {match: \bnull\b, name: constant.language.null.chai}
+- {match: \b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Math|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|Radio|RegExp|Reset|Select|String|Style|Submit|screen|sun|Text|Textarea|window|XMLHttpRequest)\b,
+  name: support.class.chai}
+- {match: '\b(s(h(ift|ow(Mod(elessDialog|alDialog)|Help))|croll(X|By(Pages|Lines)?|Y|To)?|t(op|rike)|i(n|zeToContent|debar|gnText)|ort|u(p|b(str(ing)?)?)|pli(ce|t)|e(nd|t(Re(sizable|questHeader)|M(i(nutes|lliseconds)|onth)|Seconds|Ho(tKeys|urs)|Year|Cursor|Time(out)?|Interval|ZOptions|Date|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(ome|andleEvent)|navigate|c(har(CodeAt|At)|o(s|n(cat|textual|firm)|mpile)|eil|lear(Timeout|Interval)?|a(ptureEvents|ll)|reate(StyleSheet|Popup|EventObject))|t(o(GMTString|S(tring|ource)|U(TCString|pperCase)|Lo(caleString|werCase))|est|a(n|int(Enabled)?))|i(s(NaN|Finite)|ndexOf|talics)|d(isableExternalCapture|ump|etachEvent)|u(n(shift|taint|escape|watch)|pdateCommands)|j(oin|avaEnabled)|p(o(p|w)|ush|lugins.refresh|a(ddings|rse(Int|Float)?)|r(int|ompt|eference))|e(scape|nableExternalCapture|val|lementFromPoint|x(p|ec(Script|Command)?))|valueOf|UTC|queryCommand(State|Indeterm|Enabled|Value)|f(i(nd|le(ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(nt(size|color)|rward)|loor|romCharCode)|watch|l(ink|o(ad|g)|astIndexOf)|a(sin|nchor|cos|t(tachEvent|ob|an(2)?)|pply|lert|b(s|ort))|r(ou(nd|teEvents)|e(size(By|To)|calc|turnValue|place|verse|l(oad|ease(Capture|Events)))|andom)|g(o|et(ResponseHeader|M(i(nutes|lliseconds)|onth)|Se(conds|lection)|Hours|Year|Time(zoneOffset)?|Da(y|te)|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Da(y|te)|FullYear)|FullYear|A(ttention|llResponseHeaders)))|m(in|ove(B(y|elow)|To(Absolute)?|Above)|ergeAttributes|a(tch|rgins|x))|b(toa|ig|o(ld|rderWidths)|link|ack))\b(?=\()',
+  name: support.function.chai}
+- {match: '\b(s(ub(stringData|mit)|plitText|e(t(NamedItem|Attribute(Node)?)|lect))|has(ChildNodes|Feature)|namedItem|c(l(ick|o(se|neNode))|reate(C(omment|DATASection|aption)|T(Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(ntityReference|lement)|Attribute))|tabIndex|i(nsert(Row|Before|Cell|Data)|tem)|open|delete(Row|C(ell|aption)|T(Head|Foot)|Data)|focus|write(ln)?|a(dd|ppend(Child|Data))|re(set|place(Child|Data)|move(NamedItem|Child|Attribute(Node)?)?)|get(NamedItem|Element(sBy(Name|TagName)|ById)|Attribute(Node)?)|blur)\b(?=\()',
+  name: support.function.dom.chai}
+- {match: '(?<=\.)(s(ystemLanguage|cr(ipts|ollbars|een(X|Y|Top|Left))|t(yle(Sheets)?|atus(Text|bar)?)|ibling(Below|Above)|ource|uffixes|e(curity(Policy)?|l(ection|f)))|h(istory|ost(name)?|as(h|Focus))|y|X(MLDocument|SLDocument)|n(ext|ame(space(s|URI)|Prop))|M(IN_VALUE|AX_VALUE)|c(haracterSet|o(n(structor|trollers)|okieEnabled|lorDepth|mp(onents|lete))|urrent|puClass|l(i(p(boardData)?|entInformation)|osed|asses)|alle(e|r)|rypto)|t(o(olbar|p)|ext(Transform|Indent|Decoration|Align)|ags)|SQRT(1_2|2)|i(n(ner(Height|Width)|put)|ds|gnoreCase)|zIndex|o(scpu|n(readystatechange|Line)|uter(Height|Width)|p(sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(i(splay|alog(Height|Top|Width|Left|Arguments)|rectories)|e(scription|fault(Status|Ch(ecked|arset)|View)))|u(ser(Profile|Language|Agent)|n(iqueID|defined)|pdateInterval)|_content|p(ixelDepth|ort|ersonalbar|kcs11|l(ugins|atform)|a(thname|dding(Right|Bottom|Top|Left)|rent(Window|Layer)?|ge(X(Offset)?|Y(Offset)?))|r(o(to(col|type)|duct(Sub)?|mpter)|e(vious|fix)))|e(n(coding|abledPlugin)|x(ternal|pando)|mbeds)|v(isibility|endor(Sub)?|Linkcolor)|URLUnencoded|P(I|OSITIVE_INFINITY)|f(ilename|o(nt(Size|Family|Weight)|rmName)|rame(s|Element)|gColor)|E|whiteSpace|l(i(stStyleType|n(eHeight|kColor))|o(ca(tion(bar)?|lName)|wsrc)|e(ngth|ft(Context)?)|a(st(M(odified|atch)|Index|Paren)|yer(s|X)|nguage))|a(pp(MinorVersion|Name|Co(deName|re)|Version)|vail(Height|Top|Width|Left)|ll|r(ity|guments)|Linkcolor|bove)|r(ight(Context)?|e(sponse(XML|Text)|adyState))|global|x|m(imeTypes|ultiline|enubar|argin(Right|Bottom|Top|Left))|L(N(10|2)|OG(10E|2E))|b(o(ttom|rder(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(Color|Image)))\b',
+  name: support.constant.chai}
+- {match: '(?<=\.)(s(hape|ystemId|c(heme|ope|rolling)|ta(ndby|rt)|ize|ummary|pecified|e(ctionRowIndex|lected(Index)?)|rc)|h(space|t(tpEquiv|mlFor)|e(ight|aders)|ref(lang)?)|n(o(Resize|tation(s|Name)|Shade|Href|de(Name|Type|Value)|Wrap)|extSibling|ame)|c(h(ildNodes|Off|ecked|arset)?|ite|o(ntent|o(kie|rds)|de(Base|Type)?|l(s|Span|or)|mpact)|ell(s|Spacing|Padding)|l(ear|assName)|aption)|t(ype|Bodies|itle|Head|ext|a(rget|gName)|Foot)|i(sMap|ndex|d|m(plementation|ages))|o(ptions|wnerDocument|bject)|d(i(sabled|r)|o(c(type|umentElement)|main)|e(clare|f(er|ault(Selected|Checked|Value)))|at(eTime|a))|useMap|p(ublicId|arentNode|r(o(file|mpt)|eviousSibling))|e(n(ctype|tities)|vent|lements)|v(space|ersion|alue(Type)?|Link|Align)|URL|f(irstChild|orm(s)?|ace|rame(Border)?)|width|l(ink(s)?|o(ngDesc|wSrc)|a(stChild|ng|bel))|a(nchors|c(ce(ssKey|pt(Charset)?)|tion)|ttributes|pplets|l(t|ign)|r(chive|eas)|xis|Link|bbr)|r(ow(s|Span|Index)|ules|e(v|ferrer|l|adOnly))|m(ultiple|e(thod|dia)|a(rgin(Height|Width)|xLength))|b(o(dy|rder)|ackground|gColor))\b',
+  name: support.constant.dom.chai}
+- {match: \b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\b,
+  name: support.constant.dom.chai}
+- {match: '\bon(R(ow(s(inserted|delete)|e(nter|xit))|e(s(ize(start|end)?|et)|adystatechange))|Mouse(o(ut|ver)|down|up|move)|B(efore(cut|deactivate|u(nload|pdate)|p(aste|rint)|editfocus|activate)|lur)|S(croll|top|ubmit|elect(start|ionchange)?)|H(over|elp)|C(hange|ont(extmenu|rolselect)|ut|ellchange|l(ick|ose))|D(eactivate|ata(setc(hanged|omplete)|available)|r(op|ag(start|over|drop|en(ter|d)|leave)?)|blclick)|Unload|P(aste|ropertychange)|Error(update)?|Key(down|up|press)|Focus|Load|A(ctivate|fter(update|print)|bort))\b',
+  name: support.function.event-handler.chai}
+- {match: '!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^=|\b(in|instanceof|new|delete|typeof|void)\b',
+  name: keyword.operator.chai}
+- {match: \b(Infinity|NaN|undefined)\b, name: constant.language.chai}
+- begin: (?<=[=(:]|^|return|&&|\|\||!)\s*(/)(?![/*+{}?])
+  beginCaptures:
+    '1': {name: punctuation.definition.string.begin.chai}
+  end: (/)[igm]*
+  endCaptures:
+    '1': {name: punctuation.definition.string.end.chai}
+  name: string.regexp.chai
+  patterns:
+  - {match: \\., name: constant.character.escape.chai}
+- {match: \;, name: punctuation.terminator.statement.chai}
+- {match: ',[ |\t]*', name: meta.delimiter.object.comma.chai}
+- {match: \., name: meta.delimiter.method.period.chai}
+- {match: '\{|\}', name: meta.brace.curly.chai}
+- {match: \(|\), name: meta.brace.round.chai}
+- {match: '\[|\]', name: meta.brace.square.chai}
+scopeName: source.chai
+uuid: 93E017CC-6F27-11D9-90EB-000D93589AF6
+ 
+...
--- a/contrib/sublimetext/ChaiScript.tmLanguage
+++ b/contrib/sublimetext/ChaiScript.tmLanguage
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>comment</key>
+	<string>ChaiScript Syntax: version 2.0</string>
+	<key>fileTypes</key>
+	<array>
+		<string>chai</string>
+	</array>
+	<key>firstLineMatch</key>
+	<string>^#!/usr/bin/env node</string>
+	<key>foldingStartMarker</key>
+	<string>^.*\bdef\s*(\w+\s*)?\([^\)]*\)(\s*\{[^\}]*)?\s*$</string>
+	<key>foldingStopMarker</key>
+	<string>^\s*\}</string>
+	<key>keyEquivalent</key>
+	<string>^~J</string>
+	<key>name</key>
+	<string>ChaiScript</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>comment</key>
+			<string>chaiscript shebang</string>
+			<key>match</key>
+			<string>^#</string>
+			<key>name</key>
+			<string>comment.line.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
+			<key>name</key>
+			<string>constant.numeric.chai</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>'</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>'</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.chai</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.quoted.single.chai</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)</string>
+					<key>name</key>
+					<string>constant.character.escape.chai</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>"</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>"</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.chai</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.quoted.double.chai</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
+					<key>name</key>
+					<string>constant.character.escape.chai</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>/\*\*(?!/)</string>
+			<key>captures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>\*/</string>
+			<key>name</key>
+			<string>comment.block.documentation.chai</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>/\*</string>
+			<key>captures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>\*/</string>
+			<key>name</key>
+			<string>comment.block.chai</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.chai</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(//).*$\n?</string>
+			<key>name</key>
+			<string>comment.line.double-slash.chai</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.html.chai</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.html.chai</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(&lt;!--|--&gt;)</string>
+			<key>name</key>
+			<string>comment.block.html.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(boolean|byte|char|class|double|enum|float|fun|def|int|interface|long|short|var|auto|attr)\b</string>
+			<key>name</key>
+			<string>storage.type.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(break|case|catch|continue|default|do|else|finally|else if|for|goto|if|return|switch|throw|try|while)\b</string>
+			<key>name</key>
+			<string>keyword.control.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(delete|in|instanceof|new|typeof|with)\b</string>
+			<key>name</key>
+			<string>keyword.operator.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\btrue\b</string>
+			<key>name</key>
+			<string>constant.language.boolean.true.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bfalse\b</string>
+			<key>name</key>
+			<string>constant.language.boolean.false.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bnull\b</string>
+			<key>name</key>
+			<string>constant.language.null.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Math|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|Radio|RegExp|Reset|Select|String|Style|Submit|screen|sun|Text|Textarea|window|XMLHttpRequest)\b</string>
+			<key>name</key>
+			<string>support.class.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(s(h(ift|ow(Mod(elessDialog|alDialog)|Help))|croll(X|By(Pages|Lines)?|Y|To)?|t(op|rike)|i(n|zeToContent|debar|gnText)|ort|u(p|b(str(ing)?)?)|pli(ce|t)|e(nd|t(Re(sizable|questHeader)|M(i(nutes|lliseconds)|onth)|Seconds|Ho(tKeys|urs)|Year|Cursor|Time(out)?|Interval|ZOptions|Date|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(ome|andleEvent)|navigate|c(har(CodeAt|At)|o(s|n(cat|textual|firm)|mpile)|eil|lear(Timeout|Interval)?|a(ptureEvents|ll)|reate(StyleSheet|Popup|EventObject))|t(o(GMTString|S(tring|ource)|U(TCString|pperCase)|Lo(caleString|werCase))|est|a(n|int(Enabled)?))|i(s(NaN|Finite)|ndexOf|talics)|d(isableExternalCapture|ump|etachEvent)|u(n(shift|taint|escape|watch)|pdateCommands)|j(oin|avaEnabled)|p(o(p|w)|ush|lugins.refresh|a(ddings|rse(Int|Float)?)|r(int|ompt|eference))|e(scape|nableExternalCapture|val|lementFromPoint|x(p|ec(Script|Command)?))|valueOf|UTC|queryCommand(State|Indeterm|Enabled|Value)|f(i(nd|le(ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(nt(size|color)|rward)|loor|romCharCode)|watch|l(ink|o(ad|g)|astIndexOf)|a(sin|nchor|cos|t(tachEvent|ob|an(2)?)|pply|lert|b(s|ort))|r(ou(nd|teEvents)|e(size(By|To)|calc|turnValue|place|verse|l(oad|ease(Capture|Events)))|andom)|g(o|et(ResponseHeader|M(i(nutes|lliseconds)|onth)|Se(conds|lection)|Hours|Year|Time(zoneOffset)?|Da(y|te)|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Da(y|te)|FullYear)|FullYear|A(ttention|llResponseHeaders)))|m(in|ove(B(y|elow)|To(Absolute)?|Above)|ergeAttributes|a(tch|rgins|x))|b(toa|ig|o(ld|rderWidths)|link|ack))\b(?=\()</string>
+			<key>name</key>
+			<string>support.function.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(s(ub(stringData|mit)|plitText|e(t(NamedItem|Attribute(Node)?)|lect))|has(ChildNodes|Feature)|namedItem|c(l(ick|o(se|neNode))|reate(C(omment|DATASection|aption)|T(Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(ntityReference|lement)|Attribute))|tabIndex|i(nsert(Row|Before|Cell|Data)|tem)|open|delete(Row|C(ell|aption)|T(Head|Foot)|Data)|focus|write(ln)?|a(dd|ppend(Child|Data))|re(set|place(Child|Data)|move(NamedItem|Child|Attribute(Node)?)?)|get(NamedItem|Element(sBy(Name|TagName)|ById)|Attribute(Node)?)|blur)\b(?=\()</string>
+			<key>name</key>
+			<string>support.function.dom.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;=\.)(s(ystemLanguage|cr(ipts|ollbars|een(X|Y|Top|Left))|t(yle(Sheets)?|atus(Text|bar)?)|ibling(Below|Above)|ource|uffixes|e(curity(Policy)?|l(ection|f)))|h(istory|ost(name)?|as(h|Focus))|y|X(MLDocument|SLDocument)|n(ext|ame(space(s|URI)|Prop))|M(IN_VALUE|AX_VALUE)|c(haracterSet|o(n(structor|trollers)|okieEnabled|lorDepth|mp(onents|lete))|urrent|puClass|l(i(p(boardData)?|entInformation)|osed|asses)|alle(e|r)|rypto)|t(o(olbar|p)|ext(Transform|Indent|Decoration|Align)|ags)|SQRT(1_2|2)|i(n(ner(Height|Width)|put)|ds|gnoreCase)|zIndex|o(scpu|n(readystatechange|Line)|uter(Height|Width)|p(sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(i(splay|alog(Height|Top|Width|Left|Arguments)|rectories)|e(scription|fault(Status|Ch(ecked|arset)|View)))|u(ser(Profile|Language|Agent)|n(iqueID|defined)|pdateInterval)|_content|p(ixelDepth|ort|ersonalbar|kcs11|l(ugins|atform)|a(thname|dding(Right|Bottom|Top|Left)|rent(Window|Layer)?|ge(X(Offset)?|Y(Offset)?))|r(o(to(col|type)|duct(Sub)?|mpter)|e(vious|fix)))|e(n(coding|abledPlugin)|x(ternal|pando)|mbeds)|v(isibility|endor(Sub)?|Linkcolor)|URLUnencoded|P(I|OSITIVE_INFINITY)|f(ilename|o(nt(Size|Family|Weight)|rmName)|rame(s|Element)|gColor)|E|whiteSpace|l(i(stStyleType|n(eHeight|kColor))|o(ca(tion(bar)?|lName)|wsrc)|e(ngth|ft(Context)?)|a(st(M(odified|atch)|Index|Paren)|yer(s|X)|nguage))|a(pp(MinorVersion|Name|Co(deName|re)|Version)|vail(Height|Top|Width|Left)|ll|r(ity|guments)|Linkcolor|bove)|r(ight(Context)?|e(sponse(XML|Text)|adyState))|global|x|m(imeTypes|ultiline|enubar|argin(Right|Bottom|Top|Left))|L(N(10|2)|OG(10E|2E))|b(o(ttom|rder(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(Color|Image)))\b</string>
+			<key>name</key>
+			<string>support.constant.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;=\.)(s(hape|ystemId|c(heme|ope|rolling)|ta(ndby|rt)|ize|ummary|pecified|e(ctionRowIndex|lected(Index)?)|rc)|h(space|t(tpEquiv|mlFor)|e(ight|aders)|ref(lang)?)|n(o(Resize|tation(s|Name)|Shade|Href|de(Name|Type|Value)|Wrap)|extSibling|ame)|c(h(ildNodes|Off|ecked|arset)?|ite|o(ntent|o(kie|rds)|de(Base|Type)?|l(s|Span|or)|mpact)|ell(s|Spacing|Padding)|l(ear|assName)|aption)|t(ype|Bodies|itle|Head|ext|a(rget|gName)|Foot)|i(sMap|ndex|d|m(plementation|ages))|o(ptions|wnerDocument|bject)|d(i(sabled|r)|o(c(type|umentElement)|main)|e(clare|f(er|ault(Selected|Checked|Value)))|at(eTime|a))|useMap|p(ublicId|arentNode|r(o(file|mpt)|eviousSibling))|e(n(ctype|tities)|vent|lements)|v(space|ersion|alue(Type)?|Link|Align)|URL|f(irstChild|orm(s)?|ace|rame(Border)?)|width|l(ink(s)?|o(ngDesc|wSrc)|a(stChild|ng|bel))|a(nchors|c(ce(ssKey|pt(Charset)?)|tion)|ttributes|pplets|l(t|ign)|r(chive|eas)|xis|Link|bbr)|r(ow(s|Span|Index)|ules|e(v|ferrer|l|adOnly))|m(ultiple|e(thod|dia)|a(rgin(Height|Width)|xLength))|b(o(dy|rder)|ackground|gColor))\b</string>
+			<key>name</key>
+			<string>support.constant.dom.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\b</string>
+			<key>name</key>
+			<string>support.constant.dom.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bon(R(ow(s(inserted|delete)|e(nter|xit))|e(s(ize(start|end)?|et)|adystatechange))|Mouse(o(ut|ver)|down|up|move)|B(efore(cut|deactivate|u(nload|pdate)|p(aste|rint)|editfocus|activate)|lur)|S(croll|top|ubmit|elect(start|ionchange)?)|H(over|elp)|C(hange|ont(extmenu|rolselect)|ut|ellchange|l(ick|ose))|D(eactivate|ata(setc(hanged|omplete)|available)|r(op|ag(start|over|drop|en(ter|d)|leave)?)|blclick)|Unload|P(aste|ropertychange)|Error(update)?|Key(down|up|press)|Focus|Load|A(ctivate|fter(update|print)|bort))\b</string>
+			<key>name</key>
+			<string>support.function.event-handler.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\|\||\?\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|void)\b</string>
+			<key>name</key>
+			<string>keyword.operator.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(Infinity|NaN|undefined)\b</string>
+			<key>name</key>
+			<string>constant.language.chai</string>
+		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;=[=(:]|^|return|&amp;&amp;|\|\||!)\s*(/)(?![/*+{}?])</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.chai</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(/)[igm]*</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.chai</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.regexp.chai</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\.</string>
+					<key>name</key>
+					<string>constant.character.escape.chai</string>
+				</dict>
+			</array>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\;</string>
+			<key>name</key>
+			<string>punctuation.terminator.statement.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>,[ |\t]*</string>
+			<key>name</key>
+			<string>meta.delimiter.object.comma.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\.</string>
+			<key>name</key>
+			<string>meta.delimiter.method.period.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\{|\}</string>
+			<key>name</key>
+			<string>meta.brace.curly.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\(|\)</string>
+			<key>name</key>
+			<string>meta.brace.round.chai</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\[|\]</string>
+			<key>name</key>
+			<string>meta.brace.square.chai</string>
+		</dict>
+	</array>
+	<key>scopeName</key>
+	<string>source.chai</string>
+	<key>uuid</key>
+	<string>93E017CC-6F27-11D9-90EB-000D93589AF6</string>
+</dict>
+</plist>
--- a/include/chaiscript/chaiscript.hpp
+++ b/include/chaiscript/chaiscript.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_HPP_
 #define CHAISCRIPT_HPP_

--- a/include/chaiscript/chaiscript_basic.hpp
+++ b/include/chaiscript/chaiscript_basic.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_BASIC_HPP_
--- a/include/chaiscript/chaiscript_defines.hpp
+++ b/include/chaiscript/chaiscript_defines.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_DEFINES_HPP_
@@ -9,8 +9,7 @@

 #ifdef _MSC_VER
 #define CHAISCRIPT_STRINGIZE(x) "" #x
-#define CHAISCRIPT_STRINGIZE_EXPANDED(x) CHAISCRIPT_STRINGIZE(x)
-#define CHAISCRIPT_COMPILER_VERSION CHAISCRIPT_STRINGIZE_EXPANDED(_MSC_FULL_VER)
+#define CHAISCRIPT_COMPILER_VERSION CHAISCRIPT_STRINGIZE(_MSC_FULL_VER)
 #define CHAISCRIPT_MSVC _MSC_VER
 #define CHAISCRIPT_HAS_DECLSPEC

@@ -48,6 +47,10 @@ static_assert(_MSC_FULL_VER >= 190024210, "Visual C++ 2015 Update 3 or later req
 #endif
 #endif

+#if defined(CHAISCRIPT_MSVC) ||  (defined(__GNUC__) && __GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || (defined(__llvm__) && !defined(CHAISCRIPT_LIBCPP))
+/// \todo Make this support other compilers when possible
+#define CHAISCRIPT_HAS_THREAD_LOCAL
+#endif

 #if defined(__llvm__)
 #define CHAISCRIPT_CLANG
--- a/include/chaiscript/chaiscript_threading.hpp
+++ b/include/chaiscript/chaiscript_threading.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_THREADING_HPP_
 #define CHAISCRIPT_THREADING_HPP_

@@ -61,6 +57,7 @@ namespace chaiscript

      using std::recursive_mutex;

+#ifdef CHAISCRIPT_HAS_THREAD_LOCAL
      /// Typesafe thread specific storage. If threading is enabled, this class uses a mutex protected map. If
      /// threading is not enabled, the class always returns the same data, regardless of which thread it is called from.
      template<typename T>
@@ -109,6 +106,69 @@ namespace chaiscript
            }
        };

+#else
+
+#pragma message ("Threading without thread_local support is not well supported.")
+
+
+      /// Typesafe thread specific storage. If threading is enabled, this class uses a mutex protected map. If
+      /// threading is not enabled, the class always returns the same data, regardless of which thread it is called from.
+      /// 
+      /// This version is used if the compiler does not support thread_local
+      template<typename T>
+        class Thread_Storage
+        {
+          public:
+
+            explicit Thread_Storage(void *)
+            {
+            }
+
+            inline const T *operator->() const
+            {
+              return get_tls().get();
+            }
+
+            inline const T &operator*() const
+            {
+              return *get_tls();
+            }
+
+            inline T *operator->()
+            {
+              return get_tls().get();
+            }
+
+            inline T &operator*()
+            {
+              return *get_tls();
+            }
+
+
+          private:
+            /// \todo this leaks thread instances. It needs to be culled from time to time
+            std::shared_ptr<T> get_tls() const
+            {
+              unique_lock<mutex> lock(m_mutex);
+
+              const auto id = std::this_thread::get_id();
+              auto itr = m_instances.find(id);
+
+              if (itr != m_instances.end()) { return itr->second; }
+
+              std::shared_ptr<T> new_instance(std::make_shared<T>());
+
+              m_instances.insert(std::make_pair(id, new_instance));
+
+              return new_instance;
+            }
+
+
+            mutable mutex m_mutex;
+            mutable std::unordered_map<std::thread::id, std::shared_ptr<T> > m_instances;
+        };
+#endif // threading enabled but no tls
+
 #else // threading disabled
      template<typename T>
      class unique_lock 
--- a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
+++ b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_BAD_BOXED_CAST_HPP_
 #define CHAISCRIPT_BAD_BOXED_CAST_HPP_

--- a/include/chaiscript/dispatchkit/bind_first.hpp
+++ b/include/chaiscript/dispatchkit/bind_first.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_BIND_FIRST_HPP_
 #define CHAISCRIPT_BIND_FIRST_HPP_

--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_BOOTSTRAP_HPP_
 #define CHAISCRIPT_BOOTSTRAP_HPP_

--- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 /// \file
 /// This file contains utility functions for registration of STL container
 /// classes. The methodology used is based on the SGI STL concepts.
--- a/include/chaiscript/dispatchkit/boxed_cast.hpp
+++ b/include/chaiscript/dispatchkit/boxed_cast.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_BOXED_CAST_HPP_
 #define CHAISCRIPT_BOXED_CAST_HPP_

--- a/include/chaiscript/dispatchkit/boxed_cast_helper.hpp
+++ b/include/chaiscript/dispatchkit/boxed_cast_helper.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_BOXED_CAST_HELPER_HPP_
 #define CHAISCRIPT_BOXED_CAST_HELPER_HPP_

@@ -171,17 +167,6 @@ namespace chaiscript
        }
      };

-    /// Cast_Helper_Inner for casting to a std::unique_ptr<> & type
-    /// \todo Fix the fact that this has to be in a shared_ptr for now
-    template<typename Result>
-      struct Cast_Helper_Inner<const std::unique_ptr<Result> &>
-      {
-        static std::unique_ptr<Result> &cast(const Boxed_Value &ob, const Type_Conversions_State *)
-        {
-          return *(ob.get().cast<std::shared_ptr<std::unique_ptr<Result>>>());
-        }
-      };
-

    /// Cast_Helper_Inner for casting to a std::shared_ptr<> type
    template<typename Result>
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -1,12 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
 #ifndef CHAISCRIPT_BOXED_NUMERIC_HPP_
 #define CHAISCRIPT_BOXED_NUMERIC_HPP_

@@ -588,67 +585,6 @@ namespace chaiscript

      }

-      template<typename Source, typename Target> 
-      static void check_type()
-      {
-#ifdef CHAISCRIPT_MSVC
-// MSVC complains about this being redundant / tautologica l
-#pragma warning(push)
-#pragma warning(disable : 4127 6287)
-#endif
-        if (sizeof(Source) != sizeof(Target)
-            || std::is_signed<Source>() != std::is_signed<Target>()
-            || std::is_floating_point<Source>() != std::is_floating_point<Target>())
-        {
-          throw chaiscript::detail::exception::bad_any_cast();
-        }
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-      }
-
-      template<typename Target> Target get_as_checked() const
-      {
-        switch (get_common_type(bv)) {
-          case Common_Types::t_int32:
-            check_type<int32_t, Target>();
-            return get_as_aux<Target, int32_t>(bv);
-          case Common_Types::t_uint8:
-            check_type<uint8_t, Target>();
-            return get_as_aux<Target, uint8_t>(bv);
-          case Common_Types::t_int8:
-            check_type<int8_t, Target>();
-            return get_as_aux<Target, int8_t>(bv);
-          case Common_Types::t_uint16:
-            check_type<uint16_t, Target>();
-            return get_as_aux<Target, uint16_t>(bv);
-          case Common_Types::t_int16:
-            check_type<int16_t, Target>();
-            return get_as_aux<Target, int16_t>(bv);
-          case Common_Types::t_uint32:
-            check_type<uint32_t, Target>();
-            return get_as_aux<Target, uint32_t>(bv);
-          case Common_Types::t_uint64:
-            check_type<uint64_t, Target>();
-            return get_as_aux<Target, uint64_t>(bv);
-          case Common_Types::t_int64:
-            check_type<int64_t, Target>();
-            return get_as_aux<Target, int64_t>(bv);
-          case Common_Types::t_double:
-            check_type<double, Target>();
-            return get_as_aux<Target, double>(bv);
-          case Common_Types::t_float:
-            check_type<float, Target>();
-            return get_as_aux<Target, float>(bv);
-          case Common_Types::t_long_double:
-            check_type<long double, Target>();
-            return get_as_aux<Target, long double>(bv);
-        }
-
-        throw chaiscript::detail::exception::bad_any_cast();
-      }
-
-
      template<typename Target> Target get_as() const
      {
        switch (get_common_type(bv)) {
--- a/include/chaiscript/dispatchkit/boxed_value.hpp
+++ b/include/chaiscript/dispatchkit/boxed_value.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_BOXED_VALUE_HPP_
 #define CHAISCRIPT_BOXED_VALUE_HPP_

@@ -39,11 +35,11 @@ namespace chaiscript
      {
        Data(const Type_Info &ti,
            chaiscript::detail::Any to,
-            bool is_ref,
+            bool tr,
            const void *t_void_ptr,
            bool t_return_value)
          : m_type_info(ti), m_obj(std::move(to)), m_data_ptr(ti.is_const()?nullptr:const_cast<void *>(t_void_ptr)), m_const_data_ptr(t_void_ptr),
-            m_is_ref(is_ref), m_return_value(t_return_value)
+            m_is_ref(tr), m_return_value(t_return_value)
        {
        }

@@ -158,7 +154,7 @@ namespace chaiscript
            return std::make_shared<Data>(
                  detail::Get_Type_Info<T>::get(), 
                  chaiscript::detail::Any(std::make_shared<std::unique_ptr<T>>(std::move(obj))), 
-                  true,
+                  false,
                  ptr,
                  t_return_value
                );
@@ -255,9 +251,8 @@ namespace chaiscript
          ~Sentinel()
          {
            // save new pointer data
-            const auto ptr_ = m_ptr.get().get();
-            m_data.get().m_data_ptr = ptr_;
-            m_data.get().m_const_data_ptr = ptr_;
+            m_data.get().m_data_ptr = m_ptr.get().get();
+            m_data.get().m_const_data_ptr = m_ptr.get().get();
          }

          Sentinel& operator=(Sentinel&&s) = default;
--- a/include/chaiscript/dispatchkit/callable_traits.hpp
+++ b/include/chaiscript/dispatchkit/callable_traits.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_CALLABLE_TRAITS_HPP_
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_DISPATCHKIT_HPP_
 #define CHAISCRIPT_DISPATCHKIT_HPP_

@@ -1104,22 +1100,30 @@ namespace chaiscript
        {
          std::vector<Type_Info> params = f.second->get_param_types();

+          std::vector<std::pair<std::string, Type_Info>> typed_params;
+
+          auto func(std::dynamic_pointer_cast<const dispatch::Dynamic_Function_Interface>(f.second));
+          if (func) {
+            typed_params = func->get_dynamic_param_types().types();
+          }
+
          dump_type(params.front());
          std::cout << " " << f.first << "(";

-          for (std::vector<Type_Info>::const_iterator itr = params.begin() + 1;
-              itr != params.end();
-              )
+          for (size_t i = 1; i < params.size(); ++i)
          {
-            dump_type(*itr);
-            ++itr;
+            if (!typed_params.empty() && !typed_params[i-1].first.empty()) {
+              std::cout << typed_params[i-1].first;
+            } else {
+              dump_type(params[i]);
+            }

-            if (itr != params.end())
-            {
+            if (i != params.size() - 1) {
              std::cout << ", ";
            }
          }

+
          std::cout << ") \n";
        }

@@ -1331,88 +1335,156 @@ namespace chaiscript
          return m_state.m_functions;
        }

-        static bool function_less_than(const Proxy_Function &lhs, const Proxy_Function &rhs)
+
+        static std::vector<Type_Info> param_types(const Proxy_Function &t_f)
        {
+          assert(t_f);
+          return t_f->get_param_types();
+        }

-          auto dynamic_lhs(std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(lhs));
-          auto dynamic_rhs(std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(rhs));
+        static std::vector<std::pair<std::string, Type_Info>> param_types(const std::shared_ptr<const dispatch::Dynamic_Function_Interface> &t_f)
+        {
+          assert(t_f);
+          const auto types = t_f->get_dynamic_param_types().types();
+          std::vector<std::pair<std::string, Type_Info>> ret(1);
+          ret.insert(ret.end(), types.begin(), types.end());
+          return ret;
+        }

-          if (dynamic_lhs && dynamic_rhs)
+        static Type_Info type_info(const std::pair<std::string, Type_Info> &t_ti)
+        {
+          return t_ti.second;
+        }
+
+        static Type_Info type_info(const Type_Info &t_ti)
+        {
+          return t_ti;
+        }
+
+        static std::string dynamic_type_name(const std::pair<std::string, Type_Info> &t_ti)
+        {
+          return t_ti.first.empty()?t_ti.second.name():t_ti.first;
+        }
+
+        static std::string dynamic_type_name(const Type_Info &ti)
+        {
+          return ti.name();
+        }
+
+
+        template<typename LHS, typename RHS>
+          static bool params_less_than(const LHS &t_lhs, const RHS &t_rhs)
          {
-            if (dynamic_lhs->get_guard())
+            assert(t_lhs);
+            assert(t_rhs);
+            const auto lhsparamtypes = param_types(t_lhs);
+            const auto rhsparamtypes = param_types(t_rhs);
+
+            const auto lhssize = lhsparamtypes.size();
+            const auto rhssize = rhsparamtypes.size();
+
+            constexpr auto boxed_type = user_type<Boxed_Value>();
+            constexpr auto boxed_pod_type = user_type<Boxed_Number>();
+            constexpr auto dynamic_type = user_type<dispatch::Dynamic_Object>();
+
+            for (size_t i = 1; i < lhssize && i < rhssize; ++i)
            {
-              return dynamic_rhs->get_guard() ? false : true;
-            } else {
-              return false;
-            }
-          }
+              const Type_Info lt = type_info(lhsparamtypes[i]);
+              const Type_Info rt = type_info(rhsparamtypes[i]);
+              const std::string ln = dynamic_type_name(lhsparamtypes[i]);
+              const std::string rn = dynamic_type_name(rhsparamtypes[i]);
+
+              if ( (lt.bare_equal(dynamic_type) || lt.is_undef())
+                  && (rt.bare_equal(dynamic_type) || rt.is_undef()))
+              {
+
+                if (!ln.empty() && rn.empty()) {
+                  return true;
+                } else if (ln.empty() && !rn.empty()) { 
+                  return false;
+                } else if (!ln.empty() && !rn.empty()) {
+                  if (ln < rn) {
+                    return true;
+                  } else if (rn < ln) {
+                    return false;
+                  }
+
+                  // the remaining cases are handled by the is_const rules below
+                }
+              }
+
+              if (lt.bare_equal(rt) && lt.is_const() == rt.is_const())
+              {
+                continue; // The first two types are essentially the same, next iteration
+              }
+
+              // const is after non-const for the same type
+              if (lt.bare_equal(rt) && lt.is_const() && !rt.is_const())
+              {
+                return false;
+              }
+
+              if (lt.bare_equal(rt) && !lt.is_const())
+              {
+                return true;
+              }
+
+              // boxed_values are sorted last
+              if (lt.bare_equal(boxed_type))
+              {
+                return false;
+              }
+
+              if (rt.bare_equal(boxed_type))
+              {
+                return true;
+              }
+
+              if (lt.bare_equal(boxed_pod_type))
+              {
+                return false;
+              }
+
+              if (rt.bare_equal(boxed_pod_type))
+              {
+                return true;
+              }
+
+              // otherwise, we want to sort by typeid
+              return lt < rt;
+            }
+
+            // if everything else checks out, sort on guard
+            //
+            auto dynamic_lhs(std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_lhs));
+            auto dynamic_rhs(std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_rhs));
+
+            if (dynamic_lhs && dynamic_rhs) {
+              if (dynamic_lhs->get_guard() && !dynamic_rhs->get_guard()) {
+                return true;
+              } else if (dynamic_rhs->get_guard()) {
+                return false;
+              }
+            }

-          if (dynamic_lhs && !dynamic_rhs)
-          {
            return false;
          }

-          if (!dynamic_lhs && dynamic_rhs)
+        static bool function_less_than(const Proxy_Function &lhs, const Proxy_Function &rhs)
+        {
+          auto dynamic_lhs(std::dynamic_pointer_cast<const dispatch::Dynamic_Function_Interface>(lhs));
+          auto dynamic_rhs(std::dynamic_pointer_cast<const dispatch::Dynamic_Function_Interface>(rhs));
+       
+          if (dynamic_lhs && dynamic_rhs)
          {
-            return true;
+            return params_less_than(dynamic_lhs, dynamic_rhs);
+          } else if (dynamic_lhs) {
+            return params_less_than(dynamic_lhs, rhs);
+          } else if (dynamic_rhs) {
+            return params_less_than(lhs, dynamic_rhs);
+          } else {
+            return params_less_than(lhs, rhs);
          }
-
-          const auto &lhsparamtypes = lhs->get_param_types();
-          const auto &rhsparamtypes = rhs->get_param_types();
-
-          const auto lhssize = lhsparamtypes.size();
-          const auto rhssize = rhsparamtypes.size();
-
-          static const auto boxed_type = user_type<Boxed_Value>();
-          static const auto boxed_pod_type = user_type<Boxed_Number>();
-
-          for (size_t i = 1; i < lhssize && i < rhssize; ++i)
-          {
-            const Type_Info &lt = lhsparamtypes[i];
-            const Type_Info &rt = rhsparamtypes[i];
-
-            if (lt.bare_equal(rt) && lt.is_const() == rt.is_const())
-            {
-              continue; // The first two types are essentially the same, next iteration
-            }
-
-            // const is after non-const for the same type
-            if (lt.bare_equal(rt) && lt.is_const() && !rt.is_const())
-            {
-              return false;
-            }
-
-            if (lt.bare_equal(rt) && !lt.is_const())
-            {
-              return true;
-            }
-
-            // boxed_values are sorted last
-            if (lt.bare_equal(boxed_type))
-            {
-              return false;
-            }
-
-            if (rt.bare_equal(boxed_type))
-            {
-              return true;
-            }
-
-            if (lt.bare_equal(boxed_pod_type))
-            {
-              return false;
-            }
-
-            if (rt.bare_equal(boxed_pod_type))
-            {
-              return true;
-            }
-
-            // otherwise, we want to sort by typeid
-            return lt < rt;
-          }
-
-          return false;
        }


--- a/include/chaiscript/dispatchkit/dynamic_object.hpp
+++ b/include/chaiscript/dispatchkit/dynamic_object.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_DYNAMIC_OBJECT_HPP_
 #define CHAISCRIPT_DYNAMIC_OBJECT_HPP_

--- a/include/chaiscript/dispatchkit/dynamic_object_detail.hpp
+++ b/include/chaiscript/dispatchkit/dynamic_object_detail.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_DYNAMIC_OBJECT_DETAIL_HPP_
@@ -39,7 +39,7 @@ namespace chaiscript
      /// A Proxy_Function implementation designed for calling a function
      /// that is automatically guarded based on the first param based on the
      /// param's type name
-      class Dynamic_Object_Function final : public Proxy_Function_Base
+      class Dynamic_Object_Function : public Proxy_Function_Base, public Dynamic_Function_Interface
      {
        public:
          Dynamic_Object_Function(
@@ -71,6 +71,17 @@ namespace chaiscript
          Dynamic_Object_Function &operator=(const Dynamic_Object_Function) = delete;
          Dynamic_Object_Function(Dynamic_Object_Function &) = delete;

+          Param_Types get_dynamic_param_types() const override {
+            auto dynamic(std::dynamic_pointer_cast<dispatch::Dynamic_Function_Interface>(m_func));
+
+            if (dynamic) {
+              return dynamic->get_dynamic_param_types();
+            } else {
+              return Param_Types(get_param_types());
+            }
+          }
+
+
          bool operator==(const Proxy_Function_Base &f) const override
          {
            if (const auto *df = dynamic_cast<const Dynamic_Object_Function *>(&f))
@@ -173,7 +184,7 @@ namespace chaiscript
       * that is automatically guarded based on the first param based on the
       * param's type name
       */
-      class Dynamic_Object_Constructor final : public Proxy_Function_Base
+      class Dynamic_Object_Constructor final : public Proxy_Function_Base, public Dynamic_Function_Interface
      {
        public:
          Dynamic_Object_Constructor(
@@ -182,6 +193,7 @@ namespace chaiscript
            : Proxy_Function_Base(build_type_list(t_func->get_param_types()), t_func->get_arity() - 1),
              m_type_name(std::move(t_type_name)), m_func(t_func)
          {
+            assert( t_func );
            assert( (t_func->get_arity() > 0 || t_func->get_arity() < 0)
                && "Programming error, Dynamic_Object_Function must have at least one parameter (this)");
          }
@@ -199,6 +211,18 @@ namespace chaiscript
            return std::vector<Type_Info>(begin, end);
          }

+
+          Param_Types get_dynamic_param_types() const override {
+            auto dynamic(std::dynamic_pointer_cast<dispatch::Dynamic_Function_Interface>(m_func));
+
+            if (dynamic) {
+              return dynamic->get_dynamic_param_types();
+            } else {
+              return Param_Types(get_param_types());
+            }
+          }
+
+
          bool operator==(const Proxy_Function_Base &f) const override
          {
            const Dynamic_Object_Constructor *dc = dynamic_cast<const Dynamic_Object_Constructor*>(&f);
--- a/include/chaiscript/dispatchkit/exception_specification.hpp
+++ b/include/chaiscript/dispatchkit/exception_specification.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_
 #define CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_

--- a/include/chaiscript/dispatchkit/function_call.hpp
+++ b/include/chaiscript/dispatchkit/function_call.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_FUNCTION_CALL_HPP_
 #define CHAISCRIPT_FUNCTION_CALL_HPP_

--- a/include/chaiscript/dispatchkit/function_call_detail.hpp
+++ b/include/chaiscript/dispatchkit/function_call_detail.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_
 #define CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_

--- a/include/chaiscript/dispatchkit/handle_return.hpp
+++ b/include/chaiscript/dispatchkit/handle_return.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_HANDLE_RETURN_HPP_
 #define CHAISCRIPT_HANDLE_RETURN_HPP_

@@ -31,7 +27,9 @@ namespace chaiscript

    namespace detail
    {
-      /// Used internally for handling a return value from a Proxy_Function call
+      /**
+       * Used internally for handling a return value from a Proxy_Function call
+       */
      template<typename Ret>
        struct Handle_Return
        {
@@ -157,18 +155,6 @@ namespace chaiscript
        {
        };

-
-      template<typename Ret>
-        struct Handle_Return<std::unique_ptr<Ret>> : Handle_Return<std::unique_ptr<Ret> &>
-        {
-          static Boxed_Value handle(std::unique_ptr<Ret> &&r)
-          {
-            return Boxed_Value(std::move(r), true);
-          }
-        };
-
-
-
      template<typename Ret>
        struct Handle_Return<const Ret &>
        {
--- a/include/chaiscript/dispatchkit/operators.hpp
+++ b/include/chaiscript/dispatchkit/operators.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_OPERATORS_HPP_
 #define CHAISCRIPT_OPERATORS_HPP_

--- a/include/chaiscript/dispatchkit/proxy_constructors.hpp
+++ b/include/chaiscript/dispatchkit/proxy_constructors.hpp
@@ -1,12 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-

 #ifndef CHAISCRIPT_PROXY_CONSTRUCTORS_HPP_
 #define CHAISCRIPT_PROXY_CONSTRUCTORS_HPP_
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -1,12 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-

 #ifndef CHAISCRIPT_PROXY_FUNCTIONS_HPP_
 #define CHAISCRIPT_PROXY_FUNCTIONS_HPP_
@@ -56,6 +53,13 @@ namespace chaiscript
            m_doti(user_type<Dynamic_Object>())
        {}

+        explicit Param_Types(const std::vector<Type_Info> &t_types)
+          : m_types(build_param_types(t_types)),
+            m_has_types(false),
+            m_doti(user_type<Dynamic_Object>())
+        {
+        }
+
        explicit Param_Types(std::vector<std::pair<std::string, Type_Info>> t_types)
          : m_types(std::move(t_types)),
            m_has_types(false),
@@ -64,6 +68,18 @@ namespace chaiscript
          update_has_types();
        }

+        static std::vector<std::pair<std::string, Type_Info>> build_param_types(const std::vector<Type_Info> &t_types)
+        {
+          std::vector<std::pair<std::string, Type_Info>> retval;
+          std::transform(t_types.begin(), t_types.end(), std::back_inserter(retval),
+              [](const Type_Info &ti){
+                return std::make_pair(std::string(), ti);
+              }
+            );
+
+          return retval;
+        }
+
        void push_front(std::string t_name, Type_Info t_ti)
        {
          m_types.emplace(m_types.begin(), std::move(t_name), t_ti);
@@ -75,51 +91,10 @@ namespace chaiscript
          return m_types == t_rhs.m_types;
        }

-        std::vector<Boxed_Value> convert(std::vector<Boxed_Value> vals, const Type_Conversions_State &t_conversions) const
+        bool match(const std::vector<Boxed_Value> &vals, const Type_Conversions_State &t_conversions) const
        {
-          for (size_t i = 0; i < vals.size(); ++i)
-          {
-            const auto &name = m_types[i].first;
-            if (!name.empty()) {
-              const auto &bv = vals[i];
-
-              if (!bv.get_type_info().bare_equal(m_doti))
-              {
-                const auto &ti = m_types[i].second;
-                if (!ti.is_undef())
-                {
-                  if (!bv.get_type_info().bare_equal(ti)) {
-                    if (t_conversions->converts(ti, bv.get_type_info())) {
-                      try {
-                        // We will not catch any bad_boxed_dynamic_cast that is thrown, let the user get it
-                        // either way, we are not responsible if it doesn't work
-                        vals[i] = t_conversions->boxed_type_conversion(m_types[i].second, t_conversions.saves(), vals[i]);
-                      } catch (...) {
-                        try {
-                          // try going the other way
-                          vals[i] = t_conversions->boxed_type_down_conversion(m_types[i].second, t_conversions.saves(), vals[i]);
-                        } catch (const chaiscript::detail::exception::bad_any_cast &) {
-                          throw exception::bad_boxed_cast(bv.get_type_info(), *m_types[i].second.bare_type_info());
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-
-          return vals;
-        }
-
-        // first result: is a match
-        // second result: needs conversions
-        std::pair<bool, bool> match(const std::vector<Boxed_Value> &vals, const Type_Conversions_State &t_conversions) const
-        {
-          bool needs_conversion = false;
-
-          if (!m_has_types) { return std::make_pair(true, needs_conversion); }
-          if (vals.size() != m_types.size()) { return std::make_pair(false, needs_conversion); }
+          if (!m_has_types) { return true; }
+          if (vals.size() != m_types.size()) { return false; }

          for (size_t i = 0; i < vals.size(); ++i)
          {
@@ -131,31 +106,25 @@ namespace chaiscript
              {
                try {
                  const Dynamic_Object &d = boxed_cast<const Dynamic_Object &>(bv, &t_conversions);
-                  if (!(name == "Dynamic_Object" || d.get_type_name() == name)) {
-                    return std::make_pair(false, false);
-                  }
+                  return name == "Dynamic_Object" || d.get_type_name() == name;
                } catch (const std::bad_cast &) {
-                  return std::make_pair(false, false);
+                  return false;
                } 
              } else {
                const auto &ti = m_types[i].second;
                if (!ti.is_undef())
                {
                  if (!bv.get_type_info().bare_equal(ti)) {
-                    if (!t_conversions->converts(ti, bv.get_type_info())) {
-                      return std::make_pair(false, false);
-                    } else {
-                      needs_conversion = true;
-                    }
+                    return false;
                  }
                } else {
-                  return std::make_pair(false, false);
+                  return false;
                }
              }
            }
          }

-          return std::make_pair(true, needs_conversion);
+          return true;
        }

        const std::vector<std::pair<std::string, Type_Info>> &types() const
@@ -338,11 +307,18 @@ namespace chaiscript

  namespace dispatch
  {
+    class Dynamic_Function_Interface
+    {
+      public:
+        virtual ~Dynamic_Function_Interface() {}
+        virtual Param_Types get_dynamic_param_types() const = 0;
+    };
+
    /**
     * A Proxy_Function implementation that is not type safe, the called function
     * is expecting a vector<Boxed_Value> that it works with how it chooses.
     */
-    class Dynamic_Proxy_Function : public Proxy_Function_Base
+    class Dynamic_Proxy_Function : public Proxy_Function_Base, public Dynamic_Function_Interface
    {
      public:
        Dynamic_Proxy_Function(
@@ -370,7 +346,8 @@ namespace chaiscript

        bool call_match(const std::vector<Boxed_Value> &vals, const Type_Conversions_State &t_conversions) const override
        {
-          return call_match_internal(vals, t_conversions).first;
+          return (m_arity < 0 || (vals.size() == size_t(m_arity) && m_param_types.match(vals, t_conversions)))
+            && test_guard(vals, t_conversions);
        }


@@ -384,6 +361,9 @@ namespace chaiscript
          return m_parsenode;
        }

+        Param_Types get_dynamic_param_types() const override {
+          return m_param_types;
+        }

      protected:
        bool test_guard(const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions) const
@@ -402,25 +382,7 @@ namespace chaiscript
          }
        }

-        // first result: is a match
-        // second result: needs conversions
-        std::pair<bool, bool> call_match_internal(const std::vector<Boxed_Value> &vals, const Type_Conversions_State &t_conversions) const
-        {
-          const auto comparison_result = [&](){
-            if (m_arity < 0) {
-              return std::make_pair(true, false);
-            } else if (vals.size() == size_t(m_arity)) {
-              return m_param_types.match(vals, t_conversions);
-            } else {
-              return std::make_pair(false, false);
-            }
-          }();

-          return std::make_pair(
-              comparison_result.first && test_guard(vals, t_conversions), 
-              comparison_result.second
-              );
-        }

      private:
        static std::vector<Type_Info> build_param_type_list(const Param_Types &t_types)
@@ -440,10 +402,7 @@ namespace chaiscript
          return types;
        }

-      protected:
        Param_Types m_param_types;
-
-      private:
        Proxy_Function m_guard;
        AST_NodePtr m_parsenode;
    };
@@ -474,14 +433,9 @@ namespace chaiscript
      protected:
        Boxed_Value do_call(const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions) const override
        {
-          const auto match_results = call_match_internal(params, t_conversions);
-          if (match_results.first)
+          if (call_match(params, t_conversions) && test_guard(params, t_conversions))
          {
-            if (match_results.second) {
-              return m_f(m_param_types.convert(params, t_conversions));
-            } else {
-              return m_f(params);
-            }
+            return m_f(params);
          } else {
            throw exception::guard_error();
          }
@@ -920,9 +874,11 @@ namespace chaiscript
        }
    }

-    /// Take a vector of functions and a vector of parameters. Attempt to execute
-    /// each function against the set of parameters, in order, until a matching
-    /// function is found or throw dispatch_error if no matching function is found
+    /**
+     * Take a vector of functions and a vector of parameters. Attempt to execute
+     * each function against the set of parameters, in order, until a matching
+     * function is found or throw dispatch_error if no matching function is found
+     */
    template<typename Funcs>
      Boxed_Value dispatch(const Funcs &funcs,
          const std::vector<Boxed_Value> &plist, const Type_Conversions_State &t_conversions)
@@ -930,6 +886,9 @@ namespace chaiscript
        std::vector<std::pair<size_t, const Proxy_Function_Base *>> ordered_funcs;
        ordered_funcs.reserve(funcs.size());

+        const constexpr auto boxed_type = user_type<Boxed_Value>();
+        const constexpr auto dynamic_type = user_type<Dynamic_Object>();
+
        for (const auto &func : funcs)
        {
          const auto arity = func->get_arity();
@@ -941,7 +900,10 @@ namespace chaiscript
            size_t numdiffs = 0;
            for (size_t i = 0; i < plist.size(); ++i)
            {
-              if (!func->get_param_types()[i+1].bare_equal(plist[i].get_type_info()))
+              const auto &p_type = plist[i].get_type_info();
+              const auto &f_type = func->get_param_types()[i+1];
+
+              if (!(f_type.bare_equal(boxed_type) && p_type.bare_equal(dynamic_type)) && !f_type.bare_equal(p_type))
              {
                ++numdiffs;
              }
--- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_
 #define CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_

--- a/include/chaiscript/dispatchkit/register_function.hpp
+++ b/include/chaiscript/dispatchkit/register_function.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_REGISTER_FUNCTION_HPP_
 #define CHAISCRIPT_REGISTER_FUNCTION_HPP_

@@ -111,6 +107,31 @@ namespace chaiscript
      return fun(detail::bind_first(std::forward<T>(t), q));
    }

+  /// \brief Creates a new Proxy_Function object from a free function or member function and binds the first and second parameters of it
+  /// \param[in] t Function / member to expose
+  /// \param[in] q Value to bind to first parameter
+  /// \param[in] r Value to bind to second parameter
+  ///
+  /// \b Example:
+  /// \code
+  /// struct MyClass
+  /// {
+  ///   void memberfunction(int);
+  /// };
+  /// 
+  /// MyClass obj;
+  /// chaiscript::ChaiScript chai;
+  /// // Add function taking only no arguments, and permanently bound to "obj" and "1"
+  /// // memberfunction() will be equivalent to obj.memberfunction(1)
+  /// chai.add(fun(&MyClass::memberfunction, std::ref(obj), 1), "memberfunction"); 
+  /// \endcode
+  /// 
+  /// \sa \ref adding_functions
+  template<typename T, typename Q, typename R>
+    Proxy_Function fun(T &&t, Q &&q, R &&r)
+    {
+      return fun(detail::bind_first(detail::bind_first(std::forward<T>(t), std::forward<Q>(q)), std::forward<R>(r)));
+    }

 }

--- a/include/chaiscript/dispatchkit/type_conversions.hpp
+++ b/include/chaiscript/dispatchkit/type_conversions.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_
 #define CHAISCRIPT_DYNAMIC_CAST_CONVERSION_HPP_

@@ -344,11 +340,15 @@ namespace chaiscript
      {
      }

-      Type_Conversions(const Type_Conversions &t_other) = delete;
-      Type_Conversions(Type_Conversions &&) = default;
-
-      Type_Conversions &operator=(const Type_Conversions &) = delete;
-      Type_Conversions &operator=(Type_Conversions &&) = default;
+      Type_Conversions(const Type_Conversions &t_other)
+        : m_mutex(),
+          m_conversions(t_other.get_conversions()),
+          m_convertableTypes(t_other.m_convertableTypes),
+          m_num_types(m_conversions.size()),
+          m_thread_cache(this),
+          m_conversion_saves(this)
+      {
+      }

      const std::set<const std::type_info *, Less_Than> &thread_cache() const
      {
@@ -397,39 +397,28 @@ namespace chaiscript
      template<typename To>
        Boxed_Value boxed_type_conversion(Conversion_Saves &t_saves, const Boxed_Value &from) const
        {
-          return boxed_type_conversion(user_type<To>(), t_saves, from);
+          try {
+            Boxed_Value ret = get_conversion(user_type<To>(), from.get_type_info())->convert(from);
+            if (t_saves.enabled) { t_saves.saves.push_back(ret); }
+            return ret;
+          } catch (const std::out_of_range &) {
+            throw exception::bad_boxed_dynamic_cast(from.get_type_info(), typeid(To), "No known conversion");
+          } catch (const std::bad_cast &) {
+            throw exception::bad_boxed_dynamic_cast(from.get_type_info(), typeid(To), "Unable to perform dynamic_cast operation");
+          }
        }

      template<typename From>
        Boxed_Value boxed_type_down_conversion(Conversion_Saves &t_saves, const Boxed_Value &to) const
-        {
-          return boxed_type_down_conversion(user_type<From>(), t_saves, to);
-        }
-
-
-        Boxed_Value boxed_type_conversion(const Type_Info &to, Conversion_Saves &t_saves, const Boxed_Value &from) const
        {
          try {
-            Boxed_Value ret = get_conversion(to, from.get_type_info())->convert(from);
+            Boxed_Value ret = get_conversion(to.get_type_info(), user_type<From>())->convert_down(to);
            if (t_saves.enabled) { t_saves.saves.push_back(ret); }
            return ret;
          } catch (const std::out_of_range &) {
-            throw exception::bad_boxed_dynamic_cast(from.get_type_info(), *to.bare_type_info(), "No known conversion");
+            throw exception::bad_boxed_dynamic_cast(to.get_type_info(), typeid(From), "No known conversion");
          } catch (const std::bad_cast &) {
-            throw exception::bad_boxed_dynamic_cast(from.get_type_info(), *to.bare_type_info(), "Unable to perform dynamic_cast operation");
-          }
-        }
-
-        Boxed_Value boxed_type_down_conversion(const Type_Info &from, Conversion_Saves &t_saves, const Boxed_Value &to) const
-        {
-          try {
-            Boxed_Value ret = get_conversion(to.get_type_info(), from)->convert_down(to);
-            if (t_saves.enabled) { t_saves.saves.push_back(ret); }
-            return ret;
-          } catch (const std::out_of_range &) {
-            throw exception::bad_boxed_dynamic_cast(to.get_type_info(), *from.bare_type_info(), "No known conversion");
-          } catch (const std::bad_cast &) {
-            throw exception::bad_boxed_dynamic_cast(to.get_type_info(), *from.bare_type_info(), "Unable to perform dynamic_cast operation");
+            throw exception::bad_boxed_dynamic_cast(to.get_type_info(), typeid(From), "Unable to perform dynamic_cast operation");
          }
        }

--- a/include/chaiscript/dispatchkit/type_info.hpp
+++ b/include/chaiscript/dispatchkit/type_info.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_TYPE_INFO_HPP_
 #define CHAISCRIPT_TYPE_INFO_HPP_

--- a/include/chaiscript/language/chaiscript_algebraic.hpp
+++ b/include/chaiscript/language/chaiscript_algebraic.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_ALGEBRAIC_HPP_
 #define CHAISCRIPT_ALGEBRAIC_HPP_

@@ -57,11 +53,6 @@ namespace chaiscript

    static Opers to_operator(const std::string &t_str, bool t_is_unary = false)
    {
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4307)
-#endif
-
      const auto op_hash = utility::fnv1a_32(t_str.c_str());
      switch (op_hash) {
        case utility::fnv1a_32("=="): { return Opers::equals; }
@@ -95,10 +86,6 @@ namespace chaiscript
        case utility::fnv1a_32("*"): { return Opers::product; }
        default: { return Opers::invalid; }
      }
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-
    }

  };
--- a/include/chaiscript/language/chaiscript_common.hpp
+++ b/include/chaiscript/language/chaiscript_common.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_COMMON_HPP_
 #define CHAISCRIPT_COMMON_HPP_

@@ -81,7 +77,7 @@ namespace chaiscript
                                    "Array_Call", "Dot_Access", 
                                    "Lambda", "Block", "Scopeless_Block", "Def", "While", "If", "For", "Ranged_For", "Inline_Array", "Inline_Map", "Return", "File", "Prefix", "Break", "Continue", "Map_Pair", "Value_Range",
                                    "Inline_Range", "Try", "Catch", "Finally", "Method", "Attr_Decl",
-                                    "Logical_And", "Logical_Or", "Reference", "Switch", "Case", "Default", "Noop", "Class", "Binary", "Arg", "Global_Decl", "Constant", "Compiled"};
+                                    "Logical_And", "Logical_Or", "Reference", "Switch", "Case", "Default", "Ternary Condition", "Noop", "Class", "Binary", "Arg", "Global_Decl", "Constant", "Compiled"};

      return ast_node_types[static_cast<int>(ast_node_type)];
    }
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_ENGINE_HPP_
 #define CHAISCRIPT_ENGINE_HPP_

@@ -149,6 +145,9 @@ namespace chaiscript
              })
          , "call_exists");

+//      m_engine.add(fun<Boxed_Value (const dispatch::Proxy_Function_Base *, const std::vector<Boxed_Value> &)>(std::bind(&chaiscript::dispatch::Proxy_Function_Base::operator(), std::placeholders::_1, std::placeholders::_2, std::ref(m_engine.conversions()))), "call");
+//
+//

      m_engine.add(fun(
            [=](const dispatch::Proxy_Function_Base &t_fun, const std::vector<Boxed_Value> &t_params) -> Boxed_Value {
--- a/include/chaiscript/language/chaiscript_eval.hpp
+++ b/include/chaiscript/language/chaiscript_eval.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_EVAL_HPP_
 #define CHAISCRIPT_EVAL_HPP_

@@ -53,7 +49,7 @@ namespace chaiscript
    {
      /// Helper function that will set up the scope around a function call, including handling the named function parameters
      template<typename T>
-      static Boxed_Value eval_function(chaiscript::detail::Dispatch_Engine &t_ss, const AST_Node_Impl_Ptr<T> &t_node, const std::vector<std::string> &t_param_names, const std::vector<Boxed_Value> &t_vals, const std::map<std::string, Boxed_Value> *t_locals=nullptr, bool has_this_capture = false) {
+      static Boxed_Value eval_function(chaiscript::detail::Dispatch_Engine &t_ss, const AST_Node_Impl_Ptr<T> &t_node, const std::vector<std::string> &t_param_names, const std::vector<Boxed_Value> &t_vals, const std::map<std::string, Boxed_Value> *t_locals=nullptr) {
        chaiscript::detail::Dispatch_State state(t_ss);

        const Boxed_Value *thisobj = [&]() -> const Boxed_Value *{
@@ -68,7 +64,7 @@ namespace chaiscript
        }();

        chaiscript::eval::detail::Stack_Push_Pop tpp(state);
-        if (thisobj && !has_this_capture) { state.add_object("this", *thisobj); }
+        if (thisobj) { state.add_object("this", *thisobj); }

        if (t_locals) {
          for (const auto &local : *t_locals) {
@@ -437,13 +433,13 @@ namespace chaiscript
            try {

              if (lhs.is_undef()) {
-                if (!this->children.empty()
+                if ((!this->children.empty()
                     && ((this->children[0]->identifier == AST_Node_Type::Reference)
                         || (!this->children[0]->children.empty()
                              && this->children[0]->children[0]->identifier == AST_Node_Type::Reference)
                       )
+                    )
                   )
-                  
                {
                  /// \todo This does not handle the case of an unassigned reference variable
                  ///       being assigned outside of its declaration
@@ -622,9 +618,7 @@ namespace chaiscript
    struct Lambda_AST_Node final : AST_Node_Impl<T> {
        Lambda_AST_Node(std::string t_ast_node_text, Parse_Location t_loc, std::vector<AST_Node_Impl_Ptr<T>> t_children) :
          AST_Node_Impl<T>(t_ast_node_text, AST_Node_Type::Lambda, std::move(t_loc), std::move(t_children)),
-          m_param_names(Arg_List_AST_Node<T>::get_arg_names(this->children[1])),
-          m_this_capture(has_this_capture(this->children[0]->children))
-        { }
+          m_param_names(Arg_List_AST_Node<T>::get_arg_names(this->children[1])) { }

        Boxed_Value eval_internal(const chaiscript::detail::Dispatch_State &t_ss) const override {

@@ -644,26 +638,17 @@ namespace chaiscript

          return Boxed_Value(
              dispatch::make_dynamic_proxy_function(
-                  [engine, lambda_node, param_names = this->m_param_names, captures, this_capture = this->m_this_capture](const std::vector<Boxed_Value> &t_params)
+                  [engine, lambda_node, param_names = this->m_param_names, captures](const std::vector<Boxed_Value> &t_params)
                  {
-                    return detail::eval_function(engine, lambda_node, param_names, t_params, &captures, this_capture);
+                    return detail::eval_function(engine, lambda_node, param_names, t_params, &captures);
                  },
                  static_cast<int>(numparams), lambda_node, param_types
                )
              );
        }

-        static bool has_this_capture(const std::vector<AST_Node_Impl_Ptr<T>> &children) {
-          return std::any_of(std::begin(children), std::end(children),
-                [](const auto &child){
-                  return child->children[0]->text == "this";
-                }
-              );
-        }
-
      private:
        const std::vector<std::string> m_param_names;
-        const bool m_this_capture = false;

    };

@@ -1241,7 +1226,7 @@ namespace chaiscript

              if (dispatch::Param_Types(
                    std::vector<std::pair<std::string, Type_Info>>{Arg_List_AST_Node<T>::get_arg_type(catch_block->children[0], t_ss)}
-                    ).match(std::vector<Boxed_Value>{t_except}, t_ss.conversions()).first)
+                    ).match(std::vector<Boxed_Value>{t_except}, t_ss.conversions()))
              {
                t_ss.add_object(name, t_except);

--- a/include/chaiscript/language/chaiscript_optimizer.hpp
+++ b/include/chaiscript/language/chaiscript_optimizer.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_OPTIMIZER_HPP_
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_PARSER_HPP_
 #define CHAISCRIPT_PARSER_HPP_

@@ -761,7 +757,7 @@ namespace chaiscript
          try {
            auto u = std::stoull(val,nullptr,base);

-            if (!longlong_ && u >= std::numeric_limits<unsigned long>::min() && u <= std::numeric_limits<unsigned long>::max()) {
+            if (u >= std::numeric_limits<unsigned long>::min() && u <= std::numeric_limits<unsigned long>::max()) {
              return const_var(static_cast<unsigned long>(u));
            } else {
              return const_var(static_cast<unsigned long long>(u));
@@ -785,54 +781,58 @@ namespace chaiscript
      }

      /// Reads a number from the input, detecting if it's an integer or floating point
-      bool Num() {
+      bool Num(const bool t_capture = false) {
        SkipWS();

-        const auto start = m_position;
-        if (m_position.has_more() && char_in_alphabet(*m_position, detail::float_alphabet) ) {
-          try {
-            if (Hex_()) {
-              auto match = Position::str(start, m_position);
-              auto bv = buildInt(16, match, true);
-              m_match_stack.emplace_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
-              return true;
-            }
+        if (!t_capture) {
+          return Hex_() || Float_();
+        } else {
+          const auto start = m_position;
+          if (m_position.has_more() && char_in_alphabet(*m_position, detail::float_alphabet) ) {
+            try {
+              if (Hex_()) {
+                auto match = Position::str(start, m_position);
+                auto bv = buildInt(16, match, true);
+                m_match_stack.emplace_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
+                return true;
+              }

-            if (Binary_()) {
-              auto match = Position::str(start, m_position);
-              auto bv = buildInt(2, match, true);
-              m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
-              return true;
-            }
-            if (Float_()) {
-              auto match = Position::str(start, m_position);
-              auto bv = buildFloat(match);
-              m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
-              return true;
-            }
-            else {
-              IntSuffix_();
-              auto match = Position::str(start, m_position);
-              if (!match.empty() && (match[0] == '0')) {
-                auto bv = buildInt(8, match, false);
+              if (Binary_()) {
+                auto match = Position::str(start, m_position);
+                auto bv = buildInt(2, match, true);
                m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
+                return true;
              }
-              else if (!match.empty()) {
-                auto bv = buildInt(10, match, false);
+              if (Float_()) {
+                auto match = Position::str(start, m_position);
+                auto bv = buildFloat(match);
                m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
-              } else {
-                return false;
+                return true;
              }
-              return true;
+              else {
+                IntSuffix_();
+                auto match = Position::str(start, m_position);
+                if (!match.empty() && (match[0] == '0')) {
+                  auto bv = buildInt(8, match, false);
+                  m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
+                }
+                else if (!match.empty()) {
+                  auto bv = buildInt(10, match, false);
+                  m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(match), start.line, start.col, std::move(bv)));
+                } else {
+                  return false;
+                }
+                return true;
+              }
+            } catch (const std::invalid_argument &) {
+              // error parsing number passed in to buildFloat/buildInt
+              return false;
            }
-          } catch (const std::invalid_argument &) {
-            // error parsing number passed in to buildFloat/buildInt
+          }
+          else {
            return false;
          }
        }
-        else {
-          return false;
-        }
      }

      /// Reads an identifier from input which conforms to C's identifier naming conventions, without skipping initial whitespace
@@ -884,11 +884,6 @@ namespace chaiscript
            validate_object_name(text);
          }

-#ifdef CHAISCRIPT_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4307)
-#endif
-
          switch (text_hash) {
            case utility::fnv1a_32("true"): {
              m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(std::move(text), start.line, start.col, const_var(true)));
@@ -953,11 +948,6 @@ namespace chaiscript
            } break;
          }

-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-
-
          return true;
        } else {
          return false;
@@ -1188,88 +1178,92 @@ namespace chaiscript


      /// Reads (and potentially captures) a quoted string from input.  Translates escaped sequences.
-      bool Quoted_String() {
+      bool Quoted_String(const bool t_capture = false) {
        SkipWS();

-        const auto start = m_position;
+        if (!t_capture) {
+          return Quoted_String_();
+        } else {
+          const auto start = m_position;

-        if (Quoted_String_()) {
-          std::string match;
-          const auto prev_stack_top = m_match_stack.size();
+          if (Quoted_String_()) {
+            std::string match;
+            const auto prev_stack_top = m_match_stack.size();

-          bool is_interpolated = [&]()->bool {
-            Char_Parser<std::string> cparser(match, true);
+            bool is_interpolated = [&]()->bool {
+              Char_Parser<std::string> cparser(match, true);


-            auto s = start + 1, end = m_position - 1;
+              auto s = start + 1, end = m_position - 1;

-            while (s != end) {
-              if (cparser.saw_interpolation_marker) {
-                if (*s == '{') {
-                  //We've found an interpolation point
+              while (s != end) {
+                if (cparser.saw_interpolation_marker) {
+                  if (*s == '{') {
+                    //We've found an interpolation point

-                  m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(match, start.line, start.col, const_var(match)));
+                    m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(match, start.line, start.col, const_var(match)));

-                  if (cparser.is_interpolated) {
-                    //If we've seen previous interpolation, add on instead of making a new one
-                    build_match<eval::Binary_Operator_AST_Node<Tracer>>(prev_stack_top, "+");
-                  }
-
-                  //We've finished with the part of the string up to this point, so clear it
-                  match.clear();
-
-                  std::string eval_match;
-
-                  ++s;
-                  while ((s != end) && (*s != '}')) {
-                    eval_match.push_back(*s);
-                    ++s;
-                  }
-
-                  if (*s == '}') {
-                    cparser.is_interpolated = true;
-                    ++s;
-
-                    const auto tostr_stack_top = m_match_stack.size();
-
-                    m_match_stack.push_back(make_node<eval::Id_AST_Node<Tracer>>("to_string", start.line, start.col));
-
-                    const auto ev_stack_top = m_match_stack.size();
-
-                    try {
-                      m_match_stack.push_back(parse_instr_eval(eval_match));
-                    } catch (const exception::eval_error &e) {
-                      throw exception::eval_error(e.what(), File_Position(start.line, start.col), *m_filename);
+                    if (cparser.is_interpolated) {
+                      //If we've seen previous interpolation, add on instead of making a new one
+                      build_match<eval::Binary_Operator_AST_Node<Tracer>>(prev_stack_top, "+");
                    }

-                    build_match<eval::Arg_List_AST_Node<Tracer>>(ev_stack_top);
-                    build_match<eval::Fun_Call_AST_Node<Tracer>>(tostr_stack_top);
-                    build_match<eval::Binary_Operator_AST_Node<Tracer>>(prev_stack_top, "+");
+                    //We've finished with the part of the string up to this point, so clear it
+                    match.clear();
+
+                    std::string eval_match;
+
+                    ++s;
+                    while ((s != end) && (*s != '}')) {
+                      eval_match.push_back(*s);
+                      ++s;
+                    }
+
+                    if (*s == '}') {
+                      cparser.is_interpolated = true;
+                      ++s;
+
+                      const auto tostr_stack_top = m_match_stack.size();
+
+                      m_match_stack.push_back(make_node<eval::Id_AST_Node<Tracer>>("to_string", start.line, start.col));
+
+                      const auto ev_stack_top = m_match_stack.size();
+
+                      try {
+                        m_match_stack.push_back(parse_instr_eval(eval_match));
+                      } catch (const exception::eval_error &e) {
+                        throw exception::eval_error(e.what(), File_Position(start.line, start.col), *m_filename);
+                      }
+
+                      build_match<eval::Arg_List_AST_Node<Tracer>>(ev_stack_top);
+                      build_match<eval::Fun_Call_AST_Node<Tracer>>(tostr_stack_top);
+                      build_match<eval::Binary_Operator_AST_Node<Tracer>>(prev_stack_top, "+");
+                    } else {
+                      throw exception::eval_error("Unclosed in-string eval", File_Position(start.line, start.col), *m_filename);
+                    }
                  } else {
-                    throw exception::eval_error("Unclosed in-string eval", File_Position(start.line, start.col), *m_filename);
+                    match.push_back('$');
                  }
+                  cparser.saw_interpolation_marker = false;
                } else {
-                  match.push_back('$');
+                  cparser.parse(*s, start.line, start.col, *m_filename);
+                  ++s;
                }
-                cparser.saw_interpolation_marker = false;
-              } else {
-                cparser.parse(*s, start.line, start.col, *m_filename);
-                ++s;
              }
+
+              return cparser.is_interpolated;
+            }();
+
+            m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(match, start.line, start.col, const_var(match)));
+
+            if (is_interpolated) {
+              build_match<eval::Binary_Operator_AST_Node<Tracer>>(prev_stack_top, "+");
            }

-            return cparser.is_interpolated;
-          }();
-
-          m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(match, start.line, start.col, const_var(match)));
-
-          if (is_interpolated) {
-            build_match<eval::Binary_Operator_AST_Node<Tracer>>(prev_stack_top, "+");
+            return true;
+          } else {
+            return false;
          }
-
-          return true;
-        } else {
-          return false;
        }
      }

@@ -1302,31 +1296,35 @@ namespace chaiscript
      }

      /// Reads (and potentially captures) a char group from input.  Translates escaped sequences.
-      bool Single_Quoted_String() {
+      bool Single_Quoted_String(const bool t_capture = false) {
        SkipWS();

-        const auto start = m_position;
-        if (Single_Quoted_String_()) {
-          std::string match;
+        if (!t_capture) {
+          return Single_Quoted_String_();
+        } else {
+          const auto start = m_position;
+          if (Single_Quoted_String_()) {
+            std::string match;

-          {
-            // scope for cparser destructor
-            Char_Parser<std::string> cparser(match, false);
+            {
+              // scope for cparser destructor
+              Char_Parser<std::string> cparser(match, false);

-            for (auto s = start + 1, end = m_position - 1; s != end; ++s) {
-              cparser.parse(*s, start.line, start.col, *m_filename);
+              for (auto s = start + 1, end = m_position - 1; s != end; ++s) {
+                cparser.parse(*s, start.line, start.col, *m_filename);
+              }
            }
-          }

-          if (match.size() != 1) {
-            throw exception::eval_error("Single-quoted strings must be 1 character long", File_Position(m_position.line, m_position.col), *m_filename);
-          }
+            if (match.size() != 1) {
+              throw exception::eval_error("Single-quoted strings must be 1 character long", File_Position(m_position.line, m_position.col), *m_filename);
+            }

-          m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(match, start.line, start.col, const_var(char(match.at(0)))));
-          return true;
-        }
-        else {
-          return false;
+            m_match_stack.push_back(make_node<eval::Constant_AST_Node<Tracer>>(match, start.line, start.col, const_var(char(match.at(0)))));
+            return true;
+          }
+          else {
+            return false;
+          }
        }
      }

@@ -2080,7 +2078,7 @@ namespace chaiscript
        bool retval = false;

        const auto prev_stack_top = m_match_stack.size();
-        if (Lambda() || Num() || Quoted_String() || Single_Quoted_String() ||
+        if (Lambda() || Num(true) || Quoted_String(true) || Single_Quoted_String(true) ||
            Paren_Expression() || Inline_Container() || Id(false))
        {
          retval = true;
@@ -2266,14 +2264,13 @@ namespace chaiscript
      bool Prefix() {
        const auto prev_stack_top = m_match_stack.size();
        using SS = utility::Static_String;
-        constexpr const std::array<utility::Static_String, 6> prefix_opers{{
+        constexpr const std::array<utility::Static_String, 6> prefix_opers{
            SS{"++"}, 
            SS{"--"}, 
            SS{"-"}, 
            SS{"+"}, 
            SS{"!"}, 
-            SS{"~"}
-        }};
+            SS{"~"}};

        for (const auto &oper : prefix_opers)
        {
@@ -2431,7 +2428,7 @@ namespace chaiscript
        using SS = utility::Static_String;

        if (Operator()) {
-          for (const auto &sym : {SS{"="}, SS{":="}, SS{"+="}, SS{"-="}, SS{"*="}, SS{"/="}, SS{"%="}, SS{"<<="}, SS{">>="}, SS{"&="}, SS{"^="}, SS{"|="}}) 
+          for (const auto sym : {SS{"="}, SS{":="}, SS{"+="}, SS{"-="}, SS{"*="}, SS{"/="}, SS{"%="}, SS{"<<="}, SS{">>="}, SS{"&="}, SS{"^="}, SS{"|="}}) 
          {
            if (Symbol(sym, true)) {
              SkipWS(true);
--- a/include/chaiscript/language/chaiscript_posix.hpp
+++ b/include/chaiscript/language/chaiscript_posix.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_POSIX_HPP_
--- a/include/chaiscript/language/chaiscript_prelude.hpp
+++ b/include/chaiscript/language/chaiscript_prelude.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// and 2009-2017, Jason Turner (jason@emptycrate.com)
+// and 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_PRELUDE_HPP_
--- a/include/chaiscript/language/chaiscript_tracer.hpp
+++ b/include/chaiscript/language/chaiscript_tracer.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_TRACER_HPP_
--- a/include/chaiscript/language/chaiscript_unknown.hpp
+++ b/include/chaiscript/language/chaiscript_unknown.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_UNKNOWN_HPP_
--- a/include/chaiscript/language/chaiscript_windows.hpp
+++ b/include/chaiscript/language/chaiscript_windows.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_WINDOWS_HPP_
--- a/include/chaiscript/utility/fnv1a.hpp
+++ b/include/chaiscript/utility/fnv1a.hpp
@@ -1,50 +1,22 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_UTILITY_FNV1A_HPP_
 #define CHAISCRIPT_UTILITY_FNV1A_HPP_

-
 #include <cstdint>
-#include "../chaiscript_defines.hpp"
-

 namespace chaiscript
 {
-
-
  namespace utility
  {
-
-
    static constexpr std::uint32_t fnv1a_32(const char *s, std::uint32_t h = 0x811c9dc5) {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4307)
-#endif
      return (*s == 0) ? h : fnv1a_32(s+1, ((h ^ (*s)) * 0x01000193));
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
    }
-
-
  }
-
-
 }

 #endif
--- a/include/chaiscript/utility/static_string.hpp
+++ b/include/chaiscript/utility/static_string.hpp
@@ -1,7 +1,7 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

 #ifndef CHAISCRIPT_UTILITY_STATIC_STRING_HPP_
--- a/include/chaiscript/utility/utility.hpp
+++ b/include/chaiscript/utility/utility.hpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #ifndef CHAISCRIPT_UTILITY_UTILITY_HPP_
 #define CHAISCRIPT_UTILITY_UTILITY_HPP_

--- a/readme.md
+++ b/readme.md
@@ -17,7 +17,7 @@ ChaiScript
 http://www.chaiscript.com

 (c) 2009-2012 Jonathan Turner
-(c) 2009-2017 Jason Turner
+(c) 2009-2016 Jason Turner

 Release under the BSD license, see "license.txt" for details.

--- a/releasenotes.md
+++ b/releasenotes.md
@@ -26,12 +26,11 @@ Current Version: 6.0.0

 * Modular optimization system; this can be accessed via the ChaiScript_Basic interface
 * Execution tracing capability; also accessed via ChaiScript_Basic interface
-* range-based for loops `for( id : container ) { }` (much better performance than other loop types)
+* range-based for loops `for( id : container ) { }`
 * If-init expressions (ala C++17)
 * Support for passing r-value references to functions
 * Support for containing unique_ptr
 * Add helpers for exposing enum classes to ChaiScript
-* Allow typed ChaiScript defined functions to perform conversions on call #303

 #### Improvements

@@ -39,7 +38,6 @@ Current Version: 6.0.0
 * Compile size improvements
 * Significant runtime improvements (see "Modular optimization system")
 * Significant parser improvements, both with parse-time and parser initialization time (Thanks @niXman)
-* Fix type conversion to bool in conditionals

 #### Improvements Still Need To Be Made

--- a/samples/example.cpp
+++ b/samples/example.cpp
@@ -108,9 +108,9 @@ int main(int /*argc*/, char * /*argv*/[]) {
  // A shortcut to using eval is just to use the chai operator()
  chai("log(\"Test Module\", \"Test Message\");");

-  //Finally, it is possible to register a lambda as a system function, in this 
+  //Finally, it is possible to register any std::function as a system function, in this 
  //way, we can, for instance add a bound member function to the system
-  chai.add(fun([&system](){ return system.do_callbacks("Bound Test"); }), "do_callbacks");
+  chai.add(fun(&System::do_callbacks, std::ref(system), std::string("Bound Test")), "do_callbacks");

  //Call bound version of do_callbacks
  chai("do_callbacks()");
--- a/samples/fun_call_performance.cpp
+++ b/samples/fun_call_performance.cpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #include <iostream>
 #include <list>
 #include <regex>
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #include <iostream>
 #include <list>
 #include <regex>
--- a/src/stl_extra.cpp
+++ b/src/stl_extra.cpp
@@ -1,13 +1,9 @@
 // This file is distributed under the BSD License.
 // See "license.txt" for details.
 // Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
-// Copyright 2009-2017, Jason Turner (jason@emptycrate.com)
+// Copyright 2009-2016, Jason Turner (jason@emptycrate.com)
 // http://www.chaiscript.com

-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-
-
 #include <chaiscript/chaiscript_basic.hpp>
 #include <chaiscript/dispatchkit/bootstrap_stl.hpp>
 #include <list>
--- a/unittests/clone_object.chai
+++ b/unittests/clone_object.chai
@@ -0,0 +1,38 @@
+GLOBAL clone_count = 0;
+
+class Cloneable
+{
+  def Cloneable() {
+  }
+
+}
+
+
+def clone(Cloneable c)
+{
+  print("Clone called");
+  ++clone_count;
+  return c;
+}
+
+
+class MyObject
+{
+  def MyObject() {
+    this.data = Cloneable();
+  }
+
+  var data;
+}
+
+
+assert_equal(0, clone_count);
+
+var o = MyObject();
+
+assert_equal(0, clone_count);
+
+var p = o;
+
+assert_equal(1, clone_count);
+
--- a/unittests/compiled_tests.cpp
+++ b/unittests/compiled_tests.cpp
@@ -198,7 +198,7 @@ TEST_CASE("Throw int or double")
    chai.eval("throw(1.0)", chaiscript::exception_specification<int, double>());
    REQUIRE(false);
  } catch (const double e) {
-    CHECK(e == Approx(1.0));
+    CHECK(e == 1.0);
  }
 }

@@ -319,7 +319,8 @@ TEST_CASE("Function ordering")
  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
  chai.eval("def test_fun(x) { return 3; }");
  chai.eval("def test_fun(x) : x == \"hi\" { return 4; }");
-//  chai.eval("def test_fun(x) { return 5; }");
+  chai.eval("def test_fun(double d) { return 5; }");
+
  chai.add(chaiscript::fun(&function_ordering_test_one), "test_fun");
  chai.add(chaiscript::fun(&function_ordering_test_two), "test_fun");

@@ -327,6 +328,7 @@ TEST_CASE("Function ordering")
  CHECK(chai.eval<int>("auto i = 1; test_fun(i)") == 2);
  CHECK(chai.eval<int>("test_fun(\"bob\")") == 3);
  CHECK(chai.eval<int>("test_fun(\"hi\")") == 4);
+  CHECK(chai.eval<int>("test_fun(5.0)") == 5);
 }


@@ -1113,9 +1115,6 @@ TEST_CASE("Use unique_ptr")
  chai.add(chaiscript::fun([](int &i){ ++i; }), "inci");
  chai.add(chaiscript::fun([](int i){ ++i; }), "copyi");
  chai.add(chaiscript::fun([](int *i){ ++(*i); }), "derefi");
-  chai.add(chaiscript::fun([](const std::unique_ptr<int> &i){ ++(*i); }), "constrefuniqptri");
-  chai.add(chaiscript::fun([](std::unique_ptr<int> &i){ ++(*i); }), "refuniqptri");
-  chai.add(chaiscript::fun([](std::unique_ptr<int> &&i){ ++(*i); }), "rvaluniqptri");
  chai.add(chaiscript::var(std::make_unique<int>(1)), "iptr");


@@ -1126,147 +1125,9 @@ TEST_CASE("Use unique_ptr")
  CHECK(chai.eval<int>("iptr") == 2);
  chai.eval("derefi(iptr)");
  CHECK(chai.eval<int>("iptr") == 3);
-  chai.eval("constrefuniqptri(iptr)");
-  CHECK(chai.eval<int>("iptr") == 4);
-  chai.eval("refuniqptri(iptr)");
-  CHECK(chai.eval<int>("iptr") == 5);
-  chai.eval("rvaluniqptri(iptr)");
-  CHECK(chai.eval<int>("iptr") == 6);
-}
-
-
-class Unique_Ptr_Test_Class
-{
-  public:
-    Unique_Ptr_Test_Class() = default;
-    Unique_Ptr_Test_Class(const Unique_Ptr_Test_Class&) = default;
-    Unique_Ptr_Test_Class(Unique_Ptr_Test_Class &&) = default;
-    Unique_Ptr_Test_Class &operator=(const Unique_Ptr_Test_Class&) = default;
-    Unique_Ptr_Test_Class &operator=(Unique_Ptr_Test_Class&&) = default;
-    virtual ~Unique_Ptr_Test_Class() = default;
-
-    int getI() const {return 5;}
-};
-
-
-std::unique_ptr<Unique_Ptr_Test_Class> make_Unique_Ptr_Test_Class()
-{
-  return std::make_unique<Unique_Ptr_Test_Class>();
-}
-
-TEST_CASE("Call methods through unique_ptr")
-{
-  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
-
-  chai.add(chaiscript::var(std::make_unique<Unique_Ptr_Test_Class>()), "uptr");
-  chai.add(chaiscript::fun(make_Unique_Ptr_Test_Class), "make_Unique_Ptr_Test_Class");
-  chai.add(chaiscript::fun(&Unique_Ptr_Test_Class::getI), "getI");
-  CHECK(chai.eval<int>("uptr.getI()") == 5);
-  CHECK(chai.eval<int>("var uptr2 = make_Unique_Ptr_Test_Class(); uptr2.getI()") == 5);
-}
-
-
-class Unique_Ptr_Test_Base_Class
-{
-  public:
-    int getI() const {return 5;}
-};
-
-class Unique_Ptr_Test_Derived_Class : public Unique_Ptr_Test_Base_Class
-{};
-
-std::unique_ptr<Unique_Ptr_Test_Derived_Class> make_Unique_Ptr_Test_Derived_Class()
-{
-  return std::make_unique<Unique_Ptr_Test_Derived_Class>();
-}
-
-TEST_CASE("Call methods on base class through unique_ptr<derived>")
-{
-  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
-
-  chai.add(chaiscript::var(std::make_unique<Unique_Ptr_Test_Derived_Class>()), "uptr");
-  chai.add(chaiscript::fun(make_Unique_Ptr_Test_Derived_Class), "make_Unique_Ptr_Test_Derived_Class");
-  chai.add(chaiscript::fun(&Unique_Ptr_Test_Base_Class::getI), "getI");
-  chai.add(chaiscript::base_class<Unique_Ptr_Test_Base_Class, Unique_Ptr_Test_Derived_Class>());
-  CHECK(chai.eval<int>("uptr.getI()") == 5);
-  CHECK(chai.eval<int>("var uptr2 = make_Unique_Ptr_Test_Derived_Class(); uptr2.getI()") == 5);
-}
-
-
-class A
-{
-  public:
-    A() = default;
-    A(const A&) = default;
-    A(A &&) = default;
-    A &operator=(const A&) = default;
-    A &operator=(A&&) = default;
-    virtual ~A() = default;
-};
-
-class B : public A
-{
-  public:
-    B() = default;
-};
-
-TEST_CASE("Test typed chaiscript functions to perform conversions")
-{
-  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
-
-  //-------------------------------------------------------------------------
-
-  chai.add(chaiscript::user_type<A>(), "A");
-
-  chai.add(chaiscript::user_type<B>(), "B");
-  chai.add(chaiscript::base_class<A, B>());
-
-  chai.add(chaiscript::fun([](const B &)
-        {
-        }), "CppFunctWithBArg");
-
-  chai.add(chaiscript::fun([]() -> std::shared_ptr<A> 
-        {
-        return (std::shared_ptr<A>(new B()));
-        }), "Create");
-
-  chai.eval(R"(
-            var inst = Create() // A*
-
-            // it prints "A"
-            inst.type_name().print() 
-
-            // Ok it is casted using conversion
-            CppFunctWithBArg(inst)
-
-            // Define a function with B as argument
-            def ChaiFuncWithBArg(B inst)
-            {
-                    print("ok")
-            }
-
-            // don't work
-            ChaiFuncWithBArg(inst)
-            )");
-}
-
-struct Reference_MyClass
-{
-  Reference_MyClass(double& t_x) : x(t_x) {}
-  double& x;
-};
-
-TEST_CASE("Test reference member being registered")
-{
-  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
-  // Note, C++ will not allow us to do this:
-  // chai.add(chaiscript::fun(&Reference_MyClass::x) , "x");
-  chai.add(chaiscript::fun([](Reference_MyClass &r) -> decltype(auto) { return (r.x); }), "x");
-  chai.add(chaiscript::fun([](const Reference_MyClass &r) -> decltype(auto) { return (r.x); }), "x");
-  double d;
-  chai.add(chaiscript::var(Reference_MyClass(d)), "ref");
-  chai.eval("ref.x = 2.3");
-  CHECK(d == Approx(2.3));
+
+
+
 }


--- a/unittests/conversion_to_bool.chai
+++ b/unittests/conversion_to_bool.chai
@@ -7,12 +7,6 @@ if (0) {
  assert_true(false);
 }

-if (!0) {
-  assert_true(true);
-} else {
-  assert_true(false);
-}
-
 while (0) {
  assert_true(false);
 }
--- a/unittests/explicit_this_capture.chai
+++ b/unittests/explicit_this_capture.chai
@@ -1,26 +0,0 @@
-class Test
-{
-  def Test()
-  {}
-
-  def a(Function f)
-  {
-    f("test");
-//    f();
-  }
-
-  def b()
-  {
-    var l = fun [this](x) { this.thing();  }
-    this.a(l)
-  }
-
-  def thing()
-  {
-    print("hello world");
-  }
-}
-var t = Test()
-t.b()
-
-
--- a/unittests/integer_literal_test.cpp
+++ b/unittests/integer_literal_test.cpp
@@ -3,282 +3,123 @@
 #include "../static_libs/chaiscript_stdlib.hpp"


-#ifdef CHAISCRIPT_MSVC
-// ignore errors about negative unsigned integer literals
-#pragma warning(push)
-#pragma warning(disable : 4146)
-#endif
-
-
 #define TEST_LITERAL(v) test_literal(v, #v)
-#define TEST_LITERAL_SIGNED(v) test_literal(v, #v, true)

 template<typename T>
-bool test_literal(T val, const std::string &str, bool use_boxed_number = false)
+bool test_literal(T val, const std::string &str)
 {
-  std::cout << '(' << str << ") Comparing : C++ '" << val;
+  std::cout << "Comparing : " << val;
  chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
-
-  // Note, after applying the `-` it's possible that chaiscript has internally converted
-  // between two equivalently sized types (ie, unsigned long and unsigned long long on a 64bit system)
-  // so we're going to allow some leeway with the signed tests
-  T val2 = [&](){
-    if (!use_boxed_number) {
-      return chai.eval<T>(str);
-    } else {
-      return chai.eval<chaiscript::Boxed_Number>(str).get_as_checked<T>();
-    }
-  }();
-
-  std::cout << "' chai '" << val2 << "'\n";
+  T val2 = chai.eval<T>(str);
+  std::cout << " " << val2 << '\n';
  return val == val2;
 }

 int main()
 {
-  if( 
-      TEST_LITERAL(0xF)
-      && TEST_LITERAL(0xFF)
-      && TEST_LITERAL(0xFFF)
-      && TEST_LITERAL(0xFFFF)
-      && TEST_LITERAL(0xFFFFF)
-      && TEST_LITERAL(0xFFFFFF)
-      && TEST_LITERAL(0xFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFFFFFFF)
-      && TEST_LITERAL(0xFFFFFFFFFFFFFFFF) 
+  if( TEST_LITERAL(0xF)
+ && TEST_LITERAL(0xFF)
+ && TEST_LITERAL(0xFFF)
+ && TEST_LITERAL(0xFFFF)
+ && TEST_LITERAL(0xFFFFF)
+ && TEST_LITERAL(0xFFFFFF)
+ && TEST_LITERAL(0xFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFFFFFFF)
+ && TEST_LITERAL(0xFFFFFFFFFFFFFFFF) 
+ 
+ 
+ && TEST_LITERAL(01)
+ && TEST_LITERAL(017)
+ && TEST_LITERAL(0177)
+ && TEST_LITERAL(01777)
+ && TEST_LITERAL(017777)
+ && TEST_LITERAL(0177777)
+ && TEST_LITERAL(01777777)
+ && TEST_LITERAL(017777777)
+ && TEST_LITERAL(0177777777)
+ && TEST_LITERAL(01777777777)
+ && TEST_LITERAL(017777777777)
+ && TEST_LITERAL(0177777777777)
+ && TEST_LITERAL(01777777777777)
+ && TEST_LITERAL(017777777777777)
+ && TEST_LITERAL(0177777777777777)
+ && TEST_LITERAL(01777777777777777)
+ && TEST_LITERAL(017777777777777777)
+ && TEST_LITERAL(0177777777777777777)
+ && TEST_LITERAL(01777777777777777777)
+ && TEST_LITERAL(017777777777777777777)
+ && TEST_LITERAL(0177777777777777777777)
+ && TEST_LITERAL(01777777777777777777777)

+ && TEST_LITERAL(1)
+ && TEST_LITERAL(17)
+ && TEST_LITERAL(177)
+ && TEST_LITERAL(1777)
+ && TEST_LITERAL(17777)
+ && TEST_LITERAL(177777)
+ && TEST_LITERAL(1777777)
+ && TEST_LITERAL(17777777)
+ && TEST_LITERAL(177777777)
+ && TEST_LITERAL(1777777777)
+ && TEST_LITERAL(17777777777)
+ && TEST_LITERAL(177777777777)
+ && TEST_LITERAL(1777777777777)
+ && TEST_LITERAL(17777777777777)
+ && TEST_LITERAL(177777777777777)
+ && TEST_LITERAL(1777777777777777)
+ && TEST_LITERAL(17777777777777777)
+ && TEST_LITERAL(177777777777777777)
+ && TEST_LITERAL(1777777777777777777)

-      && TEST_LITERAL(01)
-      && TEST_LITERAL(017)
-      && TEST_LITERAL(0177)
-      && TEST_LITERAL(01777)
-      && TEST_LITERAL(017777)
-      && TEST_LITERAL(0177777)
-      && TEST_LITERAL(01777777)
-      && TEST_LITERAL(017777777)
-      && TEST_LITERAL(0177777777)
-      && TEST_LITERAL(01777777777)
-      && TEST_LITERAL(017777777777)
-      && TEST_LITERAL(0177777777777)
-      && TEST_LITERAL(01777777777777)
-      && TEST_LITERAL(017777777777777)
-      && TEST_LITERAL(0177777777777777)
-      && TEST_LITERAL(01777777777777777)
-      && TEST_LITERAL(017777777777777777)
-      && TEST_LITERAL(0177777777777777777)
-      && TEST_LITERAL(01777777777777777777)
-      && TEST_LITERAL(017777777777777777777)
-      && TEST_LITERAL(0177777777777777777777)
-      && TEST_LITERAL(01777777777777777777777)
+ && test_literal(0xF, "0b1111")
+ && test_literal(0xFF, "0b11111111")
+ && test_literal(0xFFF, "0b111111111111")
+ && test_literal(0xFFFF, "0b1111111111111111")
+ && test_literal(0xFFFFF, "0b11111111111111111111")
+ && test_literal(0xFFFFFF, "0b111111111111111111111111")
+ && test_literal(0xFFFFFFF, "0b1111111111111111111111111111")
+ && test_literal(0xFFFFFFFF, "0b11111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFF, "0b111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFF, "0b1111111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFFF, "0b11111111111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFFFFF, "0b1111111111111111111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFFFFFF, "0b11111111111111111111111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111111111111111")
+ && test_literal(0xFFFFFFFFFFFFFFFF, "0b1111111111111111111111111111111111111111111111111111111111111111")

-      && TEST_LITERAL(1)
-      && TEST_LITERAL(17)
-      && TEST_LITERAL(177)
-      && TEST_LITERAL(1777)
-      && TEST_LITERAL(17777)
-      && TEST_LITERAL(177777)
-      && TEST_LITERAL(1777777)
-      && TEST_LITERAL(17777777)
-      && TEST_LITERAL(177777777)
-      && TEST_LITERAL(1777777777)
-      && TEST_LITERAL(17777777777)
-      && TEST_LITERAL(177777777777)
-      && TEST_LITERAL(1777777777777)
-      && TEST_LITERAL(17777777777777)
-      && TEST_LITERAL(177777777777777)
-      && TEST_LITERAL(1777777777777777)
-      && TEST_LITERAL(17777777777777777)
-      && TEST_LITERAL(177777777777777777)
-      && TEST_LITERAL(1777777777777777777)
-
-      && test_literal(0xF, "0b1111")
-      && test_literal(0xFF, "0b11111111")
-      && test_literal(0xFFF, "0b111111111111")
-      && test_literal(0xFFFF, "0b1111111111111111")
-      && test_literal(0xFFFFF, "0b11111111111111111111")
-      && test_literal(0xFFFFFF, "0b111111111111111111111111")
-      && test_literal(0xFFFFFFF, "0b1111111111111111111111111111")
-      && test_literal(0xFFFFFFFF, "0b11111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFF, "0b111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFF, "0b1111111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFFF, "0b11111111111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFFFFF, "0b1111111111111111111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFFFFFF, "0b11111111111111111111111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111111111111111")
-      && test_literal(0xFFFFFFFFFFFFFFFF, "0b1111111111111111111111111111111111111111111111111111111111111111")
-
-      && test_literal(0x7, "0b111")
-      && test_literal(0x7F, "0b1111111")
-      && test_literal(0x7FF, "0b11111111111")
-      && test_literal(0x7FFF, "0b111111111111111")
-      && test_literal(0x7FFFF, "0b1111111111111111111")
-      && test_literal(0x7FFFFF, "0b11111111111111111111111")
-      && test_literal(0x7FFFFFF, "0b111111111111111111111111111")
-      && test_literal(0x7FFFFFFF, "0b1111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFF, "0b11111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFF, "0b111111111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFFF, "0b1111111111111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFFFF, "0b11111111111111111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFFFFFF, "0b1111111111111111111111111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFFFFFFF, "0b11111111111111111111111111111111111111111111111111111111111")
-      && test_literal(0x7FFFFFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111111111111111111")
-
-
-      && TEST_LITERAL_SIGNED(-0xF)
-      && TEST_LITERAL_SIGNED(-0xFF)
-      && TEST_LITERAL_SIGNED(-0xFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFFFFFFF)
-      && TEST_LITERAL_SIGNED(-0xFFFFFFFFFFFFFFFF) 
-
-
-      && TEST_LITERAL_SIGNED(-01)
-      && TEST_LITERAL_SIGNED(-017)
-      && TEST_LITERAL_SIGNED(-0177)
-      && TEST_LITERAL_SIGNED(-01777)
-      && TEST_LITERAL_SIGNED(-017777)
-      && TEST_LITERAL_SIGNED(-0177777)
-      && TEST_LITERAL_SIGNED(-01777777)
-      && TEST_LITERAL_SIGNED(-017777777)
-      && TEST_LITERAL_SIGNED(-0177777777)
-      && TEST_LITERAL_SIGNED(-01777777777)
-      && TEST_LITERAL_SIGNED(-017777777777)
-      && TEST_LITERAL_SIGNED(-0177777777777)
-      && TEST_LITERAL_SIGNED(-01777777777777)
-      && TEST_LITERAL_SIGNED(-017777777777777)
-      && TEST_LITERAL_SIGNED(-0177777777777777)
-      && TEST_LITERAL_SIGNED(-01777777777777777)
-      && TEST_LITERAL_SIGNED(-017777777777777777)
-      && TEST_LITERAL_SIGNED(-0177777777777777777)
-      && TEST_LITERAL_SIGNED(-01777777777777777777)
-      && TEST_LITERAL_SIGNED(-017777777777777777777)
-      && TEST_LITERAL_SIGNED(-0177777777777777777777)
-      && TEST_LITERAL_SIGNED(-01777777777777777777777)
-
-      && TEST_LITERAL_SIGNED(-1)
-      && TEST_LITERAL_SIGNED(-17)
-      && TEST_LITERAL_SIGNED(-177)
-      && TEST_LITERAL_SIGNED(-1777)
-      && TEST_LITERAL_SIGNED(-17777)
-      && TEST_LITERAL_SIGNED(-177777)
-      && TEST_LITERAL_SIGNED(-1777777)
-      && TEST_LITERAL_SIGNED(-17777777)
-      && TEST_LITERAL_SIGNED(-177777777)
-      && TEST_LITERAL_SIGNED(-1777777777)
-      && TEST_LITERAL_SIGNED(-17777777777)
-      && TEST_LITERAL_SIGNED(-177777777777)
-      && TEST_LITERAL_SIGNED(-1777777777777)
-      && TEST_LITERAL_SIGNED(-17777777777777)
-      && TEST_LITERAL_SIGNED(-177777777777777)
-      && TEST_LITERAL_SIGNED(-1777777777777777)
-      && TEST_LITERAL_SIGNED(-17777777777777777)
-      && TEST_LITERAL_SIGNED(-177777777777777777)
-      && TEST_LITERAL_SIGNED(-1777777777777777777)
-
-      // Test 8/16/24/32 bit boundaries for various types
-
-      && TEST_LITERAL(255)
-      && TEST_LITERAL(65535)
-      && TEST_LITERAL(16777215)
-#ifndef CHAISCRIPT_MSVC
-        // bug in cl.exe causes this to be incorrectly parsed as an unsigned
-        && TEST_LITERAL(4294967295)
-#endif
-
-      && TEST_LITERAL_SIGNED(-255)
-      && TEST_LITERAL_SIGNED(-65535)
-      && TEST_LITERAL_SIGNED(-16777215)
-#ifndef CHAISCRIPT_MSVC
-        // bug in cl.exe causes this to be incorrectly parsed as an unsigned
-        && TEST_LITERAL_SIGNED(-4294967295)
-#endif
-
-      && TEST_LITERAL(255u)
-      && TEST_LITERAL(65535u)
-      && TEST_LITERAL(16777215u)
-      && TEST_LITERAL(4294967295u)
-
-      && TEST_LITERAL_SIGNED(-255u)
-      && TEST_LITERAL_SIGNED(-65535u)
-      && TEST_LITERAL_SIGNED(-16777215u)
-      && TEST_LITERAL_SIGNED(-4294967295u)
-
-      && TEST_LITERAL(255l)
-      && TEST_LITERAL(65535l)
-      && TEST_LITERAL(16777215l)
-#ifndef CHAISCRIPT_MSVC
-        // bug in cl.exe causes this to be incorrectly parsed as an unsigned
-        && TEST_LITERAL(4294967295l)
-#endif
-
-      && TEST_LITERAL_SIGNED(-255l)
-      && TEST_LITERAL_SIGNED(-65535l)
-      && TEST_LITERAL_SIGNED(-16777215l)
-#ifndef CHAISCRIPT_MSVC
-        // bug in cl.exe causes this to be incorrectly parsed as an unsigned
-        && TEST_LITERAL_SIGNED(-4294967295l)
-#endif
-
-      && TEST_LITERAL(255ul)
-      && TEST_LITERAL(65535ul)
-      && TEST_LITERAL(16777215ul)
-      && TEST_LITERAL(4294967295ul)
-
-      && TEST_LITERAL_SIGNED(-255ul)
-      && TEST_LITERAL_SIGNED(-65535ul)
-      && TEST_LITERAL_SIGNED(-16777215ul)
-      && TEST_LITERAL_SIGNED(-4294967295ul)
-
-      && TEST_LITERAL(255ull)
-      && TEST_LITERAL(65535ull)
-      && TEST_LITERAL(16777215ull)
-      && TEST_LITERAL(4294967295ull)
-
-      && TEST_LITERAL_SIGNED(-255ull)
-      && TEST_LITERAL_SIGNED(-65535ull)
-      && TEST_LITERAL_SIGNED(-16777215ull)
-      && TEST_LITERAL_SIGNED(-4294967295ull)
-
-      && TEST_LITERAL(255ll)
-      && TEST_LITERAL(65535ll)
-      && TEST_LITERAL(16777215ll)
-      && TEST_LITERAL(4294967295ll)
-
-      && TEST_LITERAL_SIGNED(-255ll)
-      && TEST_LITERAL_SIGNED(-65535ll)
-      && TEST_LITERAL_SIGNED(-16777215ll)
-      && TEST_LITERAL_SIGNED(-4294967295ll)
-
-
-      )
+ && test_literal(0x7, "0b111")
+ && test_literal(0x7F, "0b1111111")
+ && test_literal(0x7FF, "0b11111111111")
+ && test_literal(0x7FFF, "0b111111111111111")
+ && test_literal(0x7FFFF, "0b1111111111111111111")
+ && test_literal(0x7FFFFF, "0b11111111111111111111111")
+ && test_literal(0x7FFFFFF, "0b111111111111111111111111111")
+ && test_literal(0x7FFFFFFF, "0b1111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFF, "0b11111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFF, "0b111111111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFFF, "0b1111111111111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFFFF, "0b11111111111111111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFFFFFF, "0b1111111111111111111111111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFFFFFFF, "0b11111111111111111111111111111111111111111111111111111111111")
+ && test_literal(0x7FFFFFFFFFFFFFFF, "0b111111111111111111111111111111111111111111111111111111111111111")
+)
  {
    return EXIT_SUCCESS;
  } else {
    return EXIT_FAILURE;
  }

+
+
+
+
 }
-
-
-#ifdef CHAISCRIPT_MSVC
-#pragma warning(pop)
-#endif
--- a/unittests/negative_numbers.chai
+++ b/unittests/negative_numbers.chai
@@ -1,12 +0,0 @@
-def numFunc(x)
-{
-  return x + 10;
-}
-
-
-// Note that unary prefix `-` has lower precedence than `.`
-// this is why these values are correct, even if counterintuitive
-
-assert_true(-5.numFunc() == -15);
-assert_true((-5).numFunc() == 5);
-
Author	SHA1	Message	Date
Jason Turner	93bc6109e7	Merge branch 'develop' into typed_function_ordering	2016-12-05 19:19:41 -07:00
Jason Turner	4119e6e7d8	Merge branch 'develop' into typed_function_ordering	2016-10-26 14:33:33 -06:00
Jason Turner	7d11b7c5f1	Merge branch 'develop' into typed_function_ordering	2016-04-20 06:41:37 -06:00
Jason Turner	82a69ca043	Merge branch 'develop' into typed_function_ordering	2016-03-15 12:46:47 -06:00
Jason Turner	dfb2394b0b	Merge branch 'update_travis_toolchain' into typed_function_ordering	2016-03-11 15:00:28 -07:00
Jason Turner	c07f413694	Merge branch 'develop' into typed_function_ordering	2016-03-04 13:33:29 -07:00
Jason Turner	172ab7b8e4	Merge branch 'develop' into typed_function_ordering	2016-02-18 08:57:55 -07:00
Jason Turner	fe8ddd1869	Merge branch 'develop' into typed_function_ordering	2016-01-20 18:32:16 -07:00
Jason Turner	5cb6f6a1a2	Merge branch 'develop' into typed_function_ordering	2016-01-20 18:28:28 -07:00
Jason Turner	95256417ac	Merge branch 'add_performance_tests' of github.com:ChaiScript/ChaiScript into typed_function_ordering	2015-10-25 15:00:08 -06:00
Jason Turner	2d2251c1da	Merge branch 'develop' of github.com:ChaiScript/ChaiScript into typed_function_ordering	2015-08-26 18:58:34 -06:00
Jason Turner	0adacc0b5e	Merge branch 'develop' of github.com:ChaiScript/ChaiScript into typed_function_ordering	2015-08-26 18:47:43 -06:00
Jason Turner	818fd0b823	Add function ordering test	2015-08-26 18:47:32 -06:00
Jason Turner	bd9af5eff4	Order typed functions over untyped specifically the chaiscript defined ones	2015-08-14 21:58:54 -06:00