Mirrors/CppCoreGuidelines
1
0
Fork 0
mirror of https://github.com/isocpp/CppCoreGuidelines.git synced 2025-12-17 04:44:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pushed merge conflicts

Browse Source
This commit is contained in:
Thibault Kruse
2016-08-22 23:00:08 +02:00
parent 9c091b642b
commit 8f8c232eff
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/Makefile
View File

@@ -55,13 +55,8 @@ show-diff: nodejs/node_modules/remark nodejs/package.json $(SOURCEPATH) $(BUILD_
.PHONY: check-references .PHONY: check-references
check-references: $(SOURCEPATH) $(BUILD_DIR) Makefile check-references: $(SOURCEPATH) $(BUILD_DIR) Makefile
## check references unique ## check references unique
<<<<<<< HEAD
@rm -f $(BUILD_DIR)/$(SOURCEFILE).uniq @rm -f $(BUILD_DIR)/$(SOURCEFILE).uniq
@grep -oP '(?<=<a name=")[^\"]+' $(SOURCEPATH) | uniq -d > $(BUILD_DIR)/$(SOURCEFILE).uniq
=======
rm -f $(BUILD_DIR)/$(SOURCEFILE).uniq
@grep -oP '(?<=<a name=")[^\"]+' $(SOURCEPATH) | sort | uniq -d > $(BUILD_DIR)/$(SOURCEFILE).uniq @grep -oP '(?<=<a name=")[^\"]+' $(SOURCEPATH) | sort | uniq -d > $(BUILD_DIR)/$(SOURCEFILE).uniq
>>>>>>> 70d056f087b45f22bda925c9657eec5eaf7a45bf
## check if output has data ## check if output has data
@if [ -s "build/CppCoreGuidelines.md.uniq" ]; then echo 'Found duplicate anchors:'; cat $(BUILD_DIR)/$(SOURCEFILE).uniq; false; fi @if [ -s "build/CppCoreGuidelines.md.uniq" ]; then echo 'Found duplicate anchors:'; cat $(BUILD_DIR)/$(SOURCEFILE).uniq; false; fi

20
scripts/python/md-split.py
View File

@@ -93,30 +93,17 @@ def process_code(read_filehandle, text_filehandle, line, linenum, sourcefile, co
if comment_idx >= 0: if comment_idx >= 0:
no_comment_line = line[:comment_idx] no_comment_line = line[:comment_idx]
text_filehandle.write(line[comment_idx + 2:]) text_filehandle.write(line[comment_idx + 2:])
<<<<<<< HEAD
if (not has_actual_code if (not has_actual_code
and not line.strip().startswith('//') and not line.strip().startswith('//')
and not line.strip().startswith('???') and not line.strip().startswith('???')
and not line.strip() ==''): and not line.strip() == ''):
has_actual_code = True has_actual_code = True
=======
if (not has_actual_code
and not line.strip().startswith('//')
and not line.strip().startswith('???')
and not line.strip() == ''):
has_actual_code = True
>>>>>>> 180cd89a1f3105a20e79b81964b4d388dca94040
else: else:
# write empty line so line numbers stay stable # write empty line so line numbers stay stable
text_filehandle.write('\n') text_filehandle.write('\n')
if (not line.strip() == '```'): if (not line.strip() == '```'):
<<<<<<< HEAD
if ('???' == no_comment_line or '...' == no_comment_line): if ('???' == no_comment_line or '...' == no_comment_line):
=======
if ('???' in no_comment_line or '...' in no_comment_line):
>>>>>>> 180cd89a1f3105a20e79b81964b4d388dca94040
has_question_marks = True has_question_marks = True
linebuffer.append(dedent(line) if not fenced else line) linebuffer.append(dedent(line) if not fenced else line)
try: try:
@@ -127,12 +114,7 @@ def process_code(read_filehandle, text_filehandle, line, linenum, sourcefile, co
break break
codefile = os.path.join(codedir, '%s%s.cpp' % (name, index)) codefile = os.path.join(codedir, '%s%s.cpp' % (name, index))
if fenced: if fenced:
<<<<<<< HEAD
text_filehandle.write('')
=======
text_filehandle.write('\n') text_filehandle.write('\n')
>>>>>>> 180cd89a1f3105a20e79b81964b4d388dca94040
if (has_actual_code and not has_question_marks): if (has_actual_code and not has_question_marks):
# add commonly used headers, so that lines can compile # add commonly used headers, so that lines can compile
with io.open(codefile, 'w') as code_filehandle: with io.open(codefile, 'w') as code_filehandle: