Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58253912a491
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf88de7f48da
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 16, 2017

  1. Fix StrptimeLexer.flex to add a comment about how to generate Strptim… 

    …eLexer.java
    @muga
    muga committed Jun 16, 2017
    Copy the full SHA
    c2eea94 View commit details

Commits on Jun 21, 2017

  1. Merge pull request #4674 from muga/fix_strptime_lexer_flex_to_add_com… 

    …ment_how_to_generate_java

Fix StrptimeLexer.flex to add a comment about how to generate the lexer
    @headius
    headius authored Jun 21, 2017
    Copy the full SHA
    cf88de7 View commit details
Showing with 18 additions and 4 deletions.
  1. +8 −1 core/src/main/java/org/jruby/lexer/StrptimeLexer.flex
  2. +10 −3 core/src/main/java/org/jruby/lexer/StrptimeLexer.java
9 changes: 8 additions & 1 deletion core/src/main/java/org/jruby/lexer/StrptimeLexer.flex
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
/* IMPORTANT: must compile with JFlex 1.4, JFlex 1.4.3 seems buggy with look-ahead */
/**
* IMPORTANT: must compile with JFlex 1.4, JFlex 1.4.3 seems buggy with look-ahead
*
* How to generate StrptimeLexer.java
* 1. Download and install JFlex 1.4 from https://sourceforge.net/projects/jflex/files/jflex/1.4/
* 2. Execute bin/jflex command to generate StrptimeLexer.java
* $ bin/jflex core/src/main/java/org/jruby/lexer/StrptimeLexer.java
*/

package org.jruby.lexer;

13 changes: 10 additions & 3 deletions core/src/main/java/org/jruby/lexer/StrptimeLexer.java
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.