Skip to content

Commit

Permalink
agree on credits living in History.md; small whitespace nitpicks
Browse files Browse the repository at this point in the history
  • Loading branch information
mirabilos committed Aug 29, 2013
1 parent 8ebdb43 commit f0a1137
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [Git master](https://github.com/cucumber/gherkin/compare/v2.12.1...master)

* Java JSONFormatter should record before hooks in next scenario ([#270](https://github.com/cucumber/gherkin/pull/270) Björn Rasmusson)
* [JavaScript] Fix encoding issues ([#272](https://github.com/cucumber/gherkin/pull/272) Lukas Degener, Thorsten Glaser)

## [2.12.1](https://github.com/cucumber/gherkin/compare/v2.12.0...v2.12.1)

Expand Down
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Copyright (c) 2009-2013 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy
Copyright (c) 2013 Lukas Degener, Thorsten Glaser

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
10 changes: 4 additions & 6 deletions ragel/lexer.js.rl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ Lexer.prototype.scan = function(data) {
};


/*
/*
* Decode utf-8 byte sequence to string.
*/
var decodeUtf8 = function(bytes){
var decodeUtf8 = function(bytes) {
var result = "";
var i = 0;
var wc;
Expand Down Expand Up @@ -220,14 +220,14 @@ var decodeUtf8 = function(bytes){

/*
* Encode string to an array of bytes using utf8 encoding.
*
*
* Javascript internally stores character data as utf16 (like java).
* String.charCodeAt() does *not* produce unicode points, but simply
* reflects this internal representation. Thus, it is necessary
* to first decode the utf-16 representation before encoding to
* utf-8.
*/
var encodeUtf8 = function(string){
var encodeUtf8 = function(string) {
var bytes = [];
var i = 0;
var j = 0;
Expand Down Expand Up @@ -274,8 +274,6 @@ Lexer.prototype.bytesToString = function(bytes) {
return decodeUtf8(bytes);
};



Lexer.prototype.stringToBytes = function(string) {
return encodeUtf8(string);
};
Expand Down

0 comments on commit f0a1137

Please sign in to comment.