generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/ChaiScript/ChaiScript

Browse Source
This commit is contained in:
Jason Turner
2012-05-21 10:17:33 -06:00
parent 3a7eff1478 4aec12c68f
commit 433905b33c
5 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/language/chaiscript_common.hpp
View File

@@ -23,7 +23,7 @@ namespace chaiscript
Comparison, Addition, Subtraction, Multiplication, Division, Modulus, Array_Call, Dot_Access, Quoted_String, Single_Quoted_String,
Lambda, Block, Def, While, If, For, Inline_Array, Inline_Map, Return, File, Prefix, Break, Map_Pair, Value_Range,
Inline_Range, Annotation, Try, Catch, Finally, Method, Attr_Decl, Shift, Equality, Bitwise_And, Bitwise_Xor, Bitwise_Or,
Logical_And, Logical_Or, Switch, Case, Default
Logical_And, Logical_Or, Switch, Case, Default, Ternary_Cond
};
};
@@ -37,7 +37,7 @@ namespace chaiscript
"Comparison", "Addition", "Subtraction", "Multiplication", "Division", "Modulus", "Array_Call", "Dot_Access", "Quoted_String", "Single_Quoted_String",
"Lambda", "Block", "Def", "While", "If", "For", "Inline_Array", "Inline_Map", "Return", "File", "Prefix", "Break", "Map_Pair", "Value_Range",
"Inline_Range", "Annotation", "Try", "Catch", "Finally", "Method", "Attr_Decl", "Shift", "Equality", "Bitwise_And", "Bitwise_Xor", "Bitwise_Or",
"Logical_And", "Logical_Or", "Switch", "Case", "Default"};
"Logical_And", "Logical_Or", "Switch", "Case", "Default", "Ternary Condition"};
return ast_node_types[ast_node_type];
}