[Rint] Correctly handle line continuation after '\' by jalopezg-git · Pull Request #8772 · root-project/root

jalopezg-git · 2021-07-29T14:41:36Z

To have better diagnostics, TRint::ProcessLineNr() prepends a #line 1 "ROOT_prompt_xxx" PP directive to each input line. However, this causes problems if the previous line is continued with '\', e.g.

root [0] #define m(x) printf("%s", \
root (cont'ed, cancel with .@) [1]x);
ROOT_prompt_0:2:2: error; '#' is not followed by a macro parameter
 ^
ROOT_prompt_0:3:1: error; use of undeclared identifier 'x'
x);
^

This PR fixes issue #8762.

Checklist:

tested changes locally

To have better diagnostics, `TRint::ProcessLineNr()` prepends a `#line 1 "ROOT_prompt_xxx"` PP directive to each input line. However, this causes problems if the previous line is continued with '\', e.g. ``` root [0] #define m(x) printf("%s", \ root (cont'ed, cancel with .@) [1]x); ROOT_prompt_0:2:2: error: '#' is not followed by a macro parameter ^ ROOT_prompt_0:3:1: error: use of undeclared identifier 'x' x); ^ ``` This patch fixes issue root-project#8762.

phsft-bot · 2021-07-29T14:41:43Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2021-07-29T15:41:59Z

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft11.dyndns.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

projectroot.roottest.python.cpp.roottest_python_cpp_cpp

phsft-bot · 2021-07-29T17:54:39Z

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

[2021-07-29T16:18:15.949Z] ghprbPullLongDescription=To have better diagnostics, TRint::ProcessLineNr() prepends a #line 1 \"ROOT_prompt_xxx\" PP directive to each input line. However, this causes problems if the previous line is continued with '', e.g.\r\n\r\nroot [0] #define m(x) printf(\"%s\", \\r\nroot (cont'ed, cancel with .@) [1]x);\r\nROOT_prompt_0:2:2: error: '#' is not followed by a macro parameter\r\n ^\r\nROOT_prompt_0:3:1: error: use of undeclared identifier 'x'\r\nx);\r\n^\r\n\r\n\r\nThis PR fixes issue [rint] Properly support line continuation after backslash \ #8762.\r\n\r\n## Checklist:\r\n- [X] tested changes locally

jalopezg-git · 2021-07-29T20:17:34Z

@phsft-bot build just on windows10/cxx14

phsft-bot · 2021-07-29T20:17:40Z

Starting build on windows10/cxx14
How to customize builds

hahnjo

LGTM. Can we have a test for this? (might need #8771 to land first)

jalopezg-git · 2021-07-30T10:15:26Z

LGTM. Can we have a test for this? (might need #8771 to land first)

Sure! (but it will have to wait until I'm back from vacations...)

Axel-Naumann

But see comment.

core/rint/src/TRint.cxx

jalopezg-git · 2021-09-08T11:15:25Z

@phsft-bot build

phsft-bot · 2021-09-08T11:15:30Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2021-09-08T11:23:01Z

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

[2021-09-08T11:23:00.221Z] CMake Error at cmake/modules/RootBuildOptions.cmake:407 (message):
[2021-09-08T11:23:00.221Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1117 (message):

phsft-bot · 2021-09-08T11:47:53Z

Build failed on mac1014/python3.
Running on macphsft17.dyndns.cern.ch:/build/jenkins/workspace/root-pullrequests-build
See console output.

Failing tests:

phsft-bot · 2021-09-08T11:51:20Z

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-4.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

projectroot.tree.treeplayer.test.gtest_tree_treeplayer_test_treeprocessormt_remotefiles

phsft-bot · 2021-09-08T12:11:42Z

Build failed on ROOT-performance-centos8-multicore/default.
Running on olbdw-01.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See console output.

Failing tests:

And 2 more

phsft-bot · 2021-09-08T12:15:38Z

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See console output.

Failing tests:

phsft-bot · 2021-09-08T12:59:42Z

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

jalopezg-git · 2021-09-08T14:24:35Z

@phsft-bot build

phsft-bot · 2021-09-08T14:24:40Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2021-09-08T14:32:17Z

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

[2021-09-08T14:32:16.366Z] CMake Error at cmake/modules/RootBuildOptions.cmake:407 (message):
[2021-09-08T14:32:16.366Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1117 (message):

phsft-bot · 2021-09-08T17:31:40Z

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

jalopezg-git · 2021-09-09T12:42:16Z

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Failing tests:

* [projectroot.runtutorials.tutorial_multicore_mp001_fillHistos](https://lcgapp-services.cern.ch/root-jenkins/job/root-pullrequests-build/125699/testReport/projectroot/runtutorials/tutorial_multicore_mp001_fillHistos/)

* [](https://lcgapp-services.cern.ch/root-jenkins/job/root-pullrequests-build/125699/testReport/projectroot/runtutorials/tutorial_multicore_mtbb001_fillHistos/)

These fails are totally unrelated.

Test that backslash-newline works in Rint; more details available at root-project/root#8772

jalopezg-git added bug affects:master in:Core Libraries labels Jul 29, 2021

jalopezg-git requested review from Axel-Naumann, bellenot, hahnjo and pcanal July 29, 2021 14:41

jalopezg-git self-assigned this Jul 29, 2021

jalopezg-git linked an issue Jul 29, 2021 that may be closed by this pull request

[rint] Properly support line continuation after backslash \ #8762

Closed

1 task

jalopezg-git requested a review from eguiraud July 29, 2021 15:43

hahnjo reviewed Jul 30, 2021

View reviewed changes

Axel-Naumann approved these changes Sep 7, 2021

View reviewed changes

core/rint/src/TRint.cxx Show resolved Hide resolved

jalopezg-git merged commit 97571ef into root-project:master Sep 9, 2021

jalopezg-git deleted the trint-fix-linecontinuation branch September 9, 2021 12:42

jalopezg-git added a commit to jalopezg-git/roottest that referenced this pull request Sep 29, 2021

[Rint] Test for issue #8772

68323a6

Test that backslash-newline works in Rint; more details available at root-project/root#8772

jalopezg-git mentioned this pull request Sep 29, 2021

[Rint] Test for issue #8772 (backslash-newline not working in Rint) root-project/roottest#781

Merged

jalopezg-git added a commit to jalopezg-git/roottest that referenced this pull request Sep 29, 2021

[Rint] Test for issue #8772

30ac8e9

Test that backslash-newline works in Rint; more details available at root-project/root#8772

jalopezg-git added a commit to jalopezg-git/roottest that referenced this pull request Sep 29, 2021

[Rint] Test for issue #8772

b1aeed3

Test that backslash-newline works in Rint; more details available at root-project/root#8772

jalopezg-git added a commit to jalopezg-git/roottest that referenced this pull request Sep 29, 2021

[Rint] Test for issue #8772

0d894a4

Test that backslash-newline works in Rint; more details available at root-project/root#8772

jalopezg-git added a commit to root-project/roottest that referenced this pull request Sep 30, 2021

[Rint] Test for issue #8772

73cebe1

Test that backslash-newline works in Rint; more details available at root-project/root#8772

Conversation

jalopezg-git commented Jul 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist:

Uh oh!

phsft-bot commented Jul 29, 2021

Uh oh!

phsft-bot commented Jul 29, 2021

Failing tests:

Uh oh!

phsft-bot commented Jul 29, 2021

Errors:

Uh oh!

jalopezg-git commented Jul 29, 2021

Uh oh!

phsft-bot commented Jul 29, 2021

Uh oh!

hahnjo left a comment

Choose a reason for hiding this comment

Uh oh!

jalopezg-git commented Jul 30, 2021

Uh oh!

Axel-Naumann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jalopezg-git commented Sep 8, 2021

Uh oh!

phsft-bot commented Sep 8, 2021

Uh oh!

phsft-bot commented Sep 8, 2021

Errors:

Uh oh!

phsft-bot commented Sep 8, 2021

Failing tests:

Uh oh!

phsft-bot commented Sep 8, 2021

Failing tests:

Uh oh!

phsft-bot commented Sep 8, 2021

Failing tests:

Uh oh!

phsft-bot commented Sep 8, 2021

Failing tests:

Uh oh!

phsft-bot commented Sep 8, 2021

Failing tests:

Uh oh!

jalopezg-git commented Sep 8, 2021

Uh oh!

phsft-bot commented Sep 8, 2021

Uh oh!

phsft-bot commented Sep 8, 2021

Errors:

Uh oh!

phsft-bot commented Sep 8, 2021

Failing tests:

Uh oh!

jalopezg-git commented Sep 9, 2021

Failing tests:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jalopezg-git commented Jul 29, 2021 •

edited

Loading