comparison: ndp.lua
ndp.lua
- changeset 7
- 7f095ddcfd54
- parent 6
- a8bbbfdd12db
- child 9
- dc0c8914ac04
equal
deleted
inserted
replaced
| 6:a8bbbfdd12db | 7:7f095ddcfd54 |
|---|---|
| 130 end }; | 130 end }; |
| 131 { P"in "^0 * month_name / | 131 { P"in "^0 * month_name / |
| 132 function (month_name) | 132 function (month_name) |
| 133 time = find_next_month_by_name(time, month_name:match("%S+$")); | 133 time = find_next_month_by_name(time, month_name:match("%S+$")); |
| 134 end }; | 134 end }; |
| 135 { P"on "^0 * day_name / | |
| 136 function (day_name) | |
| 137 time = find_next_day_by_name(time, day_name:match("%S+$")); | |
| 138 end }; | |
| 135 { P"in "^0 * ( quantity * P" " * unit_of_time ) * (P"s"^-1) / | 139 { P"in "^0 * ( quantity * P" " * unit_of_time ) * (P"s"^-1) / |
| 136 function (number_and_unit) | 140 function (number_and_unit) |
| 137 local number, unit = number_and_unit:gsub("^in ", ""):match("^(.+)%s+(.-)s?$"); | 141 local number, unit = number_and_unit:gsub("^in ", ""):match("^(.+)%s+(.-)s?$"); |
| 138 | 142 |
| 139 number = quantities[number] or tonumber(number); | 143 number = quantities[number] or tonumber(number); |
