Skip to content

Commit

Permalink
Merge branch 'main' into fix_typo_1162
Browse files Browse the repository at this point in the history
  • Loading branch information
mwouts authored Jun 30, 2024
2 parents 28f33e0 + a9131de commit 58a873c
Show file tree
Hide file tree
Showing 11 changed files with 4,643 additions and 4,108 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Jupytext ChangeLog
**Fixed**
- We have fixed a typo when `build_jupytext_contents_manager_class` can't be imported ([#1162](https://github.com/mwouts/jupytext/issues/1162))

**Added**
- Added support for Lua notebooks ([#1252](https://github.com/mwouts/jupytext/pull/1252)) - thanks to [erentar](https://github.com/erentar) for this contribution


1.16.2 (2024-05-05)
-------------------
Expand Down
1 change: 1 addition & 0 deletions docs/languages.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Jupytext works with notebooks in any of the following languages:
- Java
- Javascript
- Julia
- Lua
- Matlab
- OCaml
- Octave
Expand Down
8,216 changes: 4,108 additions & 4,108 deletions jupyterlab/yarn.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/jupytext/languages.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
"comment_suffix": "*/",
},
".xsh": {"language": "xonsh", "comment": "#"},
".lua": {"language": "lua", "comment": "--"},
}

_COMMENT_CHARS = [
Expand Down
152 changes: 152 additions & 0 deletions tests/data/notebooks/inputs/ipynb_lua/lua_example.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Source: https://www.lua.org/pil/19.3.html"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"# Sort"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Another useful function on arrays is table.sort, which we have seen before. It receives the array to be sorted, plus an optional order function. This order function receives two arguments and must return true if the first argument should come first in the sorted array. If this function is not provided, sort uses the default less-than operation (corresponding to the `<´ operator)."
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"A common mistake is to try to order the indices of a table. In a table, the indices form a set, and have no order whatsoever. If you want to order them, you have to copy them to an array and then sort the array. Let us see an example. Suppose that you read a source file and build a table that gives, for each function name, the line where that function is defined; something like this:"
]
},
{
"cell_type": "code",
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
"lines = {\n",
" luaH_set = 10,\n",
" luaH_get = 24,\n",
" luaH_present = 48,\n",
"}"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
" Now you want to print these function names in alphabetical order. If you traverse this table with pairs, the names appear in an arbitrary order. However, you cannot sort them directly, because these names are keys of the table. However, when you put these names into an array, then you can sort them. First, you must create an array with those names, then sort it, and finally print the result:"
]
},
{
"cell_type": "code",
"execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"luaH_get\n",
"luaH_present\n",
"luaH_set\n"
]
}
],
"source": [
"a = {}\n",
"for n in pairs(lines) do table.insert(a, n) end\n",
"table.sort(a)\n",
"for i,n in ipairs(a) do print(n) end"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Note that, for Lua, arrays also have no order. But we know how to count, so we get ordered values as long as we access the array with ordered indices. That is why you should always traverse arrays with ipairs, rather than pairs. The first imposes the key order 1, 2, ..., whereas the latter uses the natural arbitrary order of the table."
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"As a more advanced solution, we can write an iterator that traverses a table following the order of its keys. An optional parameter f allows the specification of an alternative order. It first sorts the keys into an array, and then iterates on the array. At each step, it returns the key and value from the original table:"
]
},
{
"cell_type": "code",
"execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
"function pairsByKeys (t, f)\n",
" local a = {}\n",
" for n in pairs(t) do table.insert(a, n) end\n",
" table.sort(a, f)\n",
" local i = 0 -- iterator variable\n",
" local iter = function () -- iterator function\n",
" i = i + 1\n",
" if a[i] == nil then return nil\n",
" else return a[i], t[a[i]]\n",
" end\n",
" end\n",
" return iter\n",
"end"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
" With this function, it is easy to print those function names in alphabetical order. The loop"
]
},
{
"cell_type": "code",
"execution_count": 9,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"luaH_get\t24\n",
"luaH_present\t48\n",
"luaH_set\t10\n"
]
}
],
"source": [
"for name, line in pairsByKeys(lines) do\n",
" print(name, line)\n",
"end"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Lua",
"language": "lua",
"name": "lua"
},
"language_info": {
"file_extension": ".lua",
"mimetype": "text/x-lua",
"name": "lua",
"version": "5.4"
}
},
"nbformat": 4,
"nbformat_minor": 2
}
64 changes: 64 additions & 0 deletions tests/data/notebooks/outputs/ipynb_to_Rmd/lua_example.Rmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
jupyter:
kernelspec:
display_name: Lua
language: lua
name: lua
---

Source: https://www.lua.org/pil/19.3.html


# Sort


Another useful function on arrays is table.sort, which we have seen before. It receives the array to be sorted, plus an optional order function. This order function receives two arguments and must return true if the first argument should come first in the sorted array. If this function is not provided, sort uses the default less-than operation (corresponding to the `<´ operator).


A common mistake is to try to order the indices of a table. In a table, the indices form a set, and have no order whatsoever. If you want to order them, you have to copy them to an array and then sort the array. Let us see an example. Suppose that you read a source file and build a table that gives, for each function name, the line where that function is defined; something like this:

```{lua}
lines = {
luaH_set = 10,
luaH_get = 24,
luaH_present = 48,
}
```

Now you want to print these function names in alphabetical order. If you traverse this table with pairs, the names appear in an arbitrary order. However, you cannot sort them directly, because these names are keys of the table. However, when you put these names into an array, then you can sort them. First, you must create an array with those names, then sort it, and finally print the result:

```{lua}
a = {}
for n in pairs(lines) do table.insert(a, n) end
table.sort(a)
for i,n in ipairs(a) do print(n) end
```

Note that, for Lua, arrays also have no order. But we know how to count, so we get ordered values as long as we access the array with ordered indices. That is why you should always traverse arrays with ipairs, rather than pairs. The first imposes the key order 1, 2, ..., whereas the latter uses the natural arbitrary order of the table.


As a more advanced solution, we can write an iterator that traverses a table following the order of its keys. An optional parameter f allows the specification of an alternative order. It first sorts the keys into an array, and then iterates on the array. At each step, it returns the key and value from the original table:

```{lua}
function pairsByKeys (t, f)
local a = {}
for n in pairs(t) do table.insert(a, n) end
table.sort(a, f)
local i = 0 -- iterator variable
local iter = function () -- iterator function
i = i + 1
if a[i] == nil then return nil
else return a[i], t[a[i]]
end
end
return iter
end
```

With this function, it is easy to print those function names in alphabetical order. The loop

```{lua}
for name, line in pairsByKeys(lines) do
print(name, line)
end
```
65 changes: 65 additions & 0 deletions tests/data/notebooks/outputs/ipynb_to_hydrogen/lua_example.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
-- -*- coding: utf-8 -*-
-- ---
-- jupyter:
-- kernelspec:
-- display_name: Lua
-- language: lua
-- name: lua
-- ---

-- %% [markdown]
-- Source: https://www.lua.org/pil/19.3.html

-- %% [markdown]
-- # Sort

-- %% [markdown]
-- Another useful function on arrays is table.sort, which we have seen before. It receives the array to be sorted, plus an optional order function. This order function receives two arguments and must return true if the first argument should come first in the sorted array. If this function is not provided, sort uses the default less-than operation (corresponding to the `<´ operator).

-- %% [markdown]
-- A common mistake is to try to order the indices of a table. In a table, the indices form a set, and have no order whatsoever. If you want to order them, you have to copy them to an array and then sort the array. Let us see an example. Suppose that you read a source file and build a table that gives, for each function name, the line where that function is defined; something like this:

-- %%
lines = {
luaH_set = 10,
luaH_get = 24,
luaH_present = 48,
}

-- %% [markdown]
-- Now you want to print these function names in alphabetical order. If you traverse this table with pairs, the names appear in an arbitrary order. However, you cannot sort them directly, because these names are keys of the table. However, when you put these names into an array, then you can sort them. First, you must create an array with those names, then sort it, and finally print the result:

-- %%
a = {}
for n in pairs(lines) do table.insert(a, n) end
table.sort(a)
for i,n in ipairs(a) do print(n) end

-- %% [markdown]
-- Note that, for Lua, arrays also have no order. But we know how to count, so we get ordered values as long as we access the array with ordered indices. That is why you should always traverse arrays with ipairs, rather than pairs. The first imposes the key order 1, 2, ..., whereas the latter uses the natural arbitrary order of the table.

-- %% [markdown]
-- As a more advanced solution, we can write an iterator that traverses a table following the order of its keys. An optional parameter f allows the specification of an alternative order. It first sorts the keys into an array, and then iterates on the array. At each step, it returns the key and value from the original table:

-- %%
function pairsByKeys (t, f)
local a = {}
for n in pairs(t) do table.insert(a, n) end
table.sort(a, f)
local i = 0 -- iterator variable
local iter = function () -- iterator function
i = i + 1
if a[i] == nil then return nil
else return a[i], t[a[i]]
end
end
return iter
end

-- %% [markdown]
-- With this function, it is easy to print those function names in alphabetical order. The loop

-- %%
for name, line in pairsByKeys(lines) do
print(name, line)
end
64 changes: 64 additions & 0 deletions tests/data/notebooks/outputs/ipynb_to_md/lua_example.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
jupyter:
kernelspec:
display_name: Lua
language: lua
name: lua
---

Source: https://www.lua.org/pil/19.3.html


# Sort


Another useful function on arrays is table.sort, which we have seen before. It receives the array to be sorted, plus an optional order function. This order function receives two arguments and must return true if the first argument should come first in the sorted array. If this function is not provided, sort uses the default less-than operation (corresponding to the `<´ operator).


A common mistake is to try to order the indices of a table. In a table, the indices form a set, and have no order whatsoever. If you want to order them, you have to copy them to an array and then sort the array. Let us see an example. Suppose that you read a source file and build a table that gives, for each function name, the line where that function is defined; something like this:

```lua
lines = {
luaH_set = 10,
luaH_get = 24,
luaH_present = 48,
}
```

Now you want to print these function names in alphabetical order. If you traverse this table with pairs, the names appear in an arbitrary order. However, you cannot sort them directly, because these names are keys of the table. However, when you put these names into an array, then you can sort them. First, you must create an array with those names, then sort it, and finally print the result:

```lua
a = {}
for n in pairs(lines) do table.insert(a, n) end
table.sort(a)
for i,n in ipairs(a) do print(n) end
```

Note that, for Lua, arrays also have no order. But we know how to count, so we get ordered values as long as we access the array with ordered indices. That is why you should always traverse arrays with ipairs, rather than pairs. The first imposes the key order 1, 2, ..., whereas the latter uses the natural arbitrary order of the table.


As a more advanced solution, we can write an iterator that traverses a table following the order of its keys. An optional parameter f allows the specification of an alternative order. It first sorts the keys into an array, and then iterates on the array. At each step, it returns the key and value from the original table:

```lua
function pairsByKeys (t, f)
local a = {}
for n in pairs(t) do table.insert(a, n) end
table.sort(a, f)
local i = 0 -- iterator variable
local iter = function () -- iterator function
i = i + 1
if a[i] == nil then return nil
else return a[i], t[a[i]]
end
end
return iter
end
```

With this function, it is easy to print those function names in alphabetical order. The loop

```lua
for name, line in pairsByKeys(lines) do
print(name, line)
end
```
Loading

0 comments on commit 58a873c

Please sign in to comment.