Merge Parser #37
Merged
Merge Parser #37
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Never got anywhere, and not going to bother writing a new parser for it
…th a label and add better treatment for identifiers
…ations, and fix several issues
Conflicts: Archs/MIPS/Mips.cpp Core/CMacro.cpp
…statement is in a conditional
Conflicts: CMakeLists.txt Commands/CDirectiveConditional.cpp Commands/CDirectiveConditional.h Core/Directives.cpp Main/Tests.h
unknownbrackets
added a commit
to unknownbrackets/armips
that referenced
this pull request
Jun 17, 2018
e2eb063 Change everything to use wide char types 33d61f3 Merge pull request Kingcom#49 from krlmlr/f-assert 09cdb40 include cassert only if necessary 8f60162 Merge pull request Kingcom#48 from krlmlr/f-assert 072a0c6 new TINYFORMAT_ASSERT() macro 689695c Remove unnecessary FormatList constructor 6b79b4b Merge pull request Kingcom#43 from nigels-com/formatarg-initialisation 48e2e48 Use NULL rather than nullptr, private default (undefined) constructor 5d9e05a nullptr initialisation of FormatArg pointers, runtime debug mode checks for nullptr 46a6d77 Merge pull request Kingcom#39 from pkunavin/master 8a2812d Fix GCC-7 Wimplicit-fallthrough warnings. d563f7f Enable experimental VS2017 in CI b6776f3 Add appveyor & travis CI badges b9d1452 Convert README to markdown 4886706 Merge pull request Kingcom#37 from c42f/cmakeify-argh df7c47d Appveyor CI build and MSVC tweaks 182e2b6 Remove simplistic Makefile.nmake eec35f0 Remove cmake test matrix script 08d2a09 Travis build on OSX + clang a6a8801 Manually fill out the build matrix 8125ad2 Travis build matrix setup for linux 278969c Cmake build for tests to eventually replace nmake 3a33bbf Minimal gcc 4.9 Travis build coverage 6f47210 Resolve coverity defects concerning potential dead code and uncaught exceptions 0586189 Workaround min macro for windows.h ab60795 Fix switch default 42d6a0c Fix useless cast 96de1a1 Add -Werror to makefile 5abc03b Fix clang -Wuninitialized warning fd72f9c Fix for VS2015: _set_output_format() is no longer available nor needed. REVERT: b7f5a22 Change everything to use wide char types git-subtree-dir: ext/tinyformat git-subtree-split: e2eb06339c21d15db13cd8aa44a4b287970124f4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a giant rewrite, so I guess it makes sense to have something for possible feedback.