Skip to content

work in progress to reorganize the code into multiple files #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lrosenthol wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

work in progress to reorganize the code into multiple files #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
29 changes: 28 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,33 @@
"*.mp": "python",
"*.joboptions": "postscript",
"*.icml": "xml",
"numbers": "cpp"
"numbers": "cpp",
"__bit_reference": "cpp",
"__hash_table": "cpp",
"__split_buffer": "cpp",
"__tree": "cpp",
"array": "cpp",
"bitset": "cpp",
"deque": "cpp",
"iterator": "cpp",
"hash_map": "cpp",
"forward_list": "cpp",
"initializer_list": "cpp",
"list": "cpp",
"map": "cpp",
"queue": "cpp",
"regex": "cpp",
"set": "cpp",
"span": "cpp",
"stack": "cpp",
"string": "cpp",
"string_view": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"filesystem": "cpp",
"chrono": "cpp",
"format": "cpp",
"type_traits": "cpp"
}
}
6 changes: 2 additions & 4 deletions json-formula.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
BE2D2C6F2AE2FB3300D04840 /* utest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utest.h; path = utest.h/utest.h; sourceTree = "<group>"; };
BE653A1C2AE16D9C00EDDA36 /* json-formula */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "json-formula"; sourceTree = BUILT_PRODUCTS_DIR; };
BE7B01812B47563C0070674C /* jfHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jfHelpers.h; sourceTree = "<group>"; };
BE9C1D632B0C3A0A00B6AD6A /* json-formula.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "json-formula.hpp"; path = "json-formula/json-formula.hpp"; sourceTree = "<group>"; };
BE9C1D642B0C3A0A00B6AD6A /* json-formula_error.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "json-formula_error.hpp"; path = "json-formula/json-formula_error.hpp"; sourceTree = "<group>"; };
BE97DD2A2B5A0103001D25AE /* json-formula */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "json-formula"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -48,10 +47,9 @@
children = (
BE2D2C512AE17A9900D04840 /* main.cpp */,
BE7B01812B47563C0070674C /* jfHelpers.h */,
BE9C1D642B0C3A0A00B6AD6A /* json-formula_error.hpp */,
BE9C1D632B0C3A0A00B6AD6A /* json-formula.hpp */,
BE2D2C552AE17AC700D04840 /* json.hpp */,
BE2D2C6F2AE2FB3300D04840 /* utest.h */,
BE97DD2A2B5A0103001D25AE /* json-formula */,
BE653A1D2AE16D9C00EDDA36 /* Products */,
);
sourceTree = "<group>";
Expand Down
Binary file modified ...deproj/project.xcworkspace/xcuserdata/lrosenth.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions json-formula.xcodeproj/xcshareddata/xcschemes/json-formula.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<CommandLineArguments>
<CommandLineArgument
argument = ""
isEnabled = "NO">
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "/Users/lrosenth/Development/json-formula-cpp/tests/*"
Expand Down Expand Up @@ -109,7 +109,7 @@
</CommandLineArgument>
<CommandLineArgument
argument = "/Users/lrosenth/Development/json-formula-cpp/tests/syntax.json"
isEnabled = "YES">
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "/Users/lrosenth/Development/json-formula-cpp/tests/unicode.json"
Expand Down
128 changes: 16 additions & 112 deletions json-formula.xcodeproj/xcuserdata/lrosenth.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "6385"
endingLineNumber = "6385"
landmarkName = "push_token(tok, ec)"
landmarkType = "7">
endingLineNumber = "6385">
<Locations>
<Location
uuid = "DC3FC74A-DF24-47D6-8ECF-A83E019A55DA - 3594956ab9458c8c"
Expand Down Expand Up @@ -454,9 +452,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1987"
endingLineNumber = "1987"
landmarkName = "evaluate(args, resources, ec)"
landmarkType = "7">
endingLineNumber = "1987">
<Locations>
<Location
uuid = "38236B9B-96C0-4482-A3DA-F1B7247BC9BE - e2e21b191be40c8f"
Expand Down Expand Up @@ -502,9 +498,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1992"
endingLineNumber = "1992"
landmarkName = "evaluate(args, resources, ec)"
landmarkType = "7">
endingLineNumber = "1992">
<Locations>
<Location
uuid = "D2C7B49A-358C-4513-9DDF-12BCC19DBB96 - e2e21b191be40c22"
Expand Down Expand Up @@ -550,9 +544,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2002"
endingLineNumber = "2002"
landmarkName = "evaluate(args, resources, ec)"
landmarkType = "7">
endingLineNumber = "2002">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -566,9 +558,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "4556"
endingLineNumber = "4556"
landmarkName = "compile(path, length, ec)"
landmarkType = "7">
endingLineNumber = "4556">
<Locations>
<Location
uuid = "E9D0A8AF-8863-4EE5-92BB-DCB15B598A85 - bdb1a0b0b568cd37"
Expand Down Expand Up @@ -644,25 +634,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "4608"
endingLineNumber = "4608"
landmarkName = "compile(path, length, ec)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "45294BBA-4466-47E8-B45C-9E1450B15B60"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "json-formula/json-formula.hpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "757"
endingLineNumber = "757"
landmarkName = "evaluate(args, resources, ec)"
landmarkType = "7">
endingLineNumber = "4608">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -676,9 +648,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "6147"
endingLineNumber = "6147"
landmarkName = "push_token(tok, ec)"
landmarkType = "7">
endingLineNumber = "6147">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -692,9 +662,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "6185"
endingLineNumber = "6185"
landmarkName = "push_token(tok, ec)"
landmarkType = "7">
endingLineNumber = "6185">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -708,9 +676,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "5772"
endingLineNumber = "5772"
landmarkName = "compile(path, length, ec)"
landmarkType = "7">
endingLineNumber = "5772">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -724,9 +690,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "4306"
endingLineNumber = "4306"
landmarkName = "compile(path, length, ec)"
landmarkType = "7">
endingLineNumber = "4306">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -740,9 +704,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "4924"
endingLineNumber = "4924"
landmarkName = "compile(path, length, ec)"
landmarkType = "7">
endingLineNumber = "4924">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -756,9 +718,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "5729"
endingLineNumber = "5729"
landmarkName = "compile(path, length, ec)"
landmarkType = "7">
endingLineNumber = "5729">
<Locations>
<Location
uuid = "49338120-E2ED-4E5C-9887-62D74E7C86F9 - bdb1a0b0b5695194"
Expand Down Expand Up @@ -804,9 +764,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "3157"
endingLineNumber = "3157"
landmarkName = "to_string()"
landmarkType = "7">
endingLineNumber = "3157">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -820,9 +778,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "3809"
endingLineNumber = "3809"
landmarkName = "jsonformula_evaluator"
landmarkType = "3">
endingLineNumber = "3809">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -836,9 +792,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "3538"
endingLineNumber = "3538"
landmarkName = "list_projection"
landmarkType = "3">
endingLineNumber = "3538">
<Locations>
<Location
uuid = "6200F683-BFD2-4E5A-939F-47D02AFE8B62 - c116dcf8a2da1cf5"
Expand Down Expand Up @@ -905,54 +859,6 @@
landmarkType = "9">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5A189FD8-8A55-4A22-BDE7-C0B012EF9E96"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "main.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "769"
endingLineNumber = "769"
landmarkName = "UTEST()"
landmarkType = "9">
<Locations>
<Location
uuid = "5A189FD8-8A55-4A22-BDE7-C0B012EF9E96 - e6e8180c5426e752"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "utest_run_json_formula_jf_strings(int*)"
moduleName = "json-formula"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lrosenth/Development/json-formula-cpp/main.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "769"
endingLineNumber = "769"
offsetFromSymbolStart = "2954">
</Location>
<Location
uuid = "5A189FD8-8A55-4A22-BDE7-C0B012EF9E96 - e6e8180c5426e752"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "utest_run_json_formula_jf_strings(int*)"
moduleName = "json-formula"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/lrosenth/Development/json-formula-cpp/main.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "769"
endingLineNumber = "769"
offsetFromSymbolStart = "2959">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
Expand All @@ -964,9 +870,7 @@
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "6503"
endingLineNumber = "6503"
landmarkName = "debug_search(doc, path, ec)"
landmarkType = "9">
endingLineNumber = "6503">
<Locations>
<Location
uuid = "19A43F5C-BE1B-482E-B28F-E87E32A7E38F - aff8f5c7180cb954"
Expand Down
Loading