comparison: ndp.lua
ndp.lua
- changeset 17
- 3a7672943895
- parent 16
- 35fb87e8289c
- child 21
- 983f96ebef08
equal
deleted
inserted
replaced
| 16:35fb87e8289c | 17:3a7672943895 |
|---|---|
| 128 end }; | 128 end }; |
| 129 { year / | 129 { year / |
| 130 function (year) | 130 function (year) |
| 131 time = adjust_time(time, "year", tonumber(year)); | 131 time = adjust_time(time, "year", tonumber(year)); |
| 132 end }; | 132 end }; |
| 133 { Pi"in "^0 * month_name / | 133 { (Pi"in " + true) * month_name / |
| 134 function (month_name) | 134 function (month_name) |
| 135 time = find_next_month_by_name(time, month_name:match("%S+$")); | 135 time = find_next_month_by_name(time, month_name:match("%S+$")); |
| 136 end }; | 136 end }; |
| 137 { Pi"on "^0 * day_name / | 137 { (Pi"on " + true) * day_name / |
| 138 function (day_name) | 138 function (day_name) |
| 139 time = find_next_day_by_name(time, day_name:match("%S+$")); | 139 time = find_next_day_by_name(time, day_name:match("%S+$")); |
| 140 end }; | 140 end }; |
| 141 { Pi"in "^0 * ( quantity * P" " * unit_of_time ) * (P"s"^-1) / | 141 { (Pi"in " + true) * ( quantity * P" " * unit_of_time ) * (P"s"^-1) / |
| 142 function (number_and_unit) | 142 function (number_and_unit) |
| 143 print("m", number_and_unit.."."); | |
| 143 local number, unit = number_and_unit:gsub("^in ", ""):match("^(.+)%s+(.-)s?$"); | 144 local number, unit = number_and_unit:gsub("^in ", ""):match("^(.+)%s+(.-)s?$"); |
| 144 | 145 |
| 145 number = quantities[number] or tonumber(number); | 146 number = quantities[number] or tonumber(number); |
| 146 | 147 |
| 147 time = time + seconds_in_a[unit] * number; | 148 time = time + seconds_in_a[unit] * number; |
