rubychan / coderay

Fast and easy syntax highlighting for selected languages, written in Ruby.
http://coderay.rubychan.de/
Other
846 stars 115 forks source link

Add C++11 keywords #195

Closed jwillemsen closed 8 years ago

jwillemsen commented 8 years ago
* lib/coderay/scanners/cpp.rb:
jwillemsen commented 8 years ago

The travis failure looks independent of my changes, rake doesn't support the old ruby versions

korny commented 8 years ago

Awesome, thanks! Funny that they are still adding keywords to that language. Do you have some example code for the test suite?

jwillemsen commented 8 years ago

Yes, I can add some example code but I can't find the test for cpp, could you maybe point me to it?

korny commented 8 years ago

They're here: https://github.com/rubychan/coderay-scanner-tests/tree/master/cpp. Instructions are here: https://github.com/rubychan/coderay/wiki/Test-Suite

jwillemsen commented 8 years ago

Done, will create a separate pull request

jwillemsen commented 8 years ago

Added rubychan/coderay-scanner-tests#9

jwillemsen commented 8 years ago

Looks the failing check has nothing todo with my change

korny commented 8 years ago

Failing tests should be fixed on master, can you update your branch again please?

jwillemsen commented 8 years ago

Done, thanks for resolving this on master, now this is again green!

jwillemsen commented 8 years ago

Anything you need in addition from my side?

jwillemsen commented 8 years ago

Fixed merge conflict

jwillemsen commented 8 years ago

Ok, travis-ci now allows again C extensions but looks RedCloth has another problem :-(

jwillemsen commented 8 years ago

Ok, allowed failure for jruby18/19 because of the RedCloth problem, now this pull request is passed on Jenkins and has no conflicts

korny commented 8 years ago

Sorry for the delay. I also updated the list of Rubies in the Travis config file, so master is green now. Can you merge again, please?

jwillemsen commented 8 years ago

Merged upstream master again into my tree, resolved merge conflicts

korny commented 8 years ago

Thank you :)

jwillemsen commented 8 years ago

Thanks for accepting them!