Dekker1/dekker-phd-thesis
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to tree-sitter lexer for pygments

Browse Source
This commit is contained in:
Jip J. Dekker 2021-03-03 15:06:34 +11:00
parent a77444b5d2
commit d0871d7451
No known key found for this signature in database
GPG Key ID: 517DF4A00618C9C3
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Pipfile
View File

@ -4,9 +4,8 @@ verify_ssl = true
name = "pypi"
[packages]
tree-sitter-minizinc = {path = "/Users/dekker1/Code/github.com/Dekker1/tree-sitter-minizinc"}
pygments = "*"
minizinc = "*"
minizinc-python = {git = "https://github.com/MiniZinc/minizinc-python"}
[dev-packages]

26
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "b6a9aafb5aa54eec17961fbf8d81f82ea6ca03c25da24edb021d9fdd44f5e6ee"
"sha256": "5d0bd9f479dec0e41b809749ff8383832e28f12349cac501f086d673455a46c6"
},
"pipfile-spec": 6,
"requires": {
@ -16,18 +16,6 @@
]
},
"default": {
"minizinc": {
"hashes": [
"sha256:c0e5fae557df0b757bbe4dbec70f7b033b2acc0acabea213e3bbcb0b41d8efeb",
"sha256:d4327468b7cdc1b1379c6fa50350393d2d0903ac1be55235f534992b4f7b2538"
],
"index": "pypi",
"version": "==0.4.2"
},
"minizinc-python": {
"git": "https://github.com/MiniZinc/minizinc-python",
"ref": "0becdd6e346c1021b26901de44dc1fc7fd9ac48c"
},
"pygments": {
"hashes": [
"sha256:37a13ba168a02ac54cc5891a42b1caec333e59b66addb7fa633ea8a6d73445c0",
@ -35,6 +23,18 @@
],
"index": "pypi",
"version": "==2.8.0"
},
"tree-sitter": {
"hashes": [
"sha256:15e7616f0e41127ca70880a40301a6ebfe58ce92db4f142eac775a38e9c38cec",
"sha256:2618b781b065d419237dcd234f7a7cd68920c4f15c6809a99ed2c2dfd6d15d01"
],
"markers": "python_version >= '3.3'",
"version": "==0.2.2"
},
"tree-sitter-minizinc": {
"path": "/Users/dekker1/Code/github.com/Dekker1/tree-sitter-minizinc",
"version": "==0.1.dev35+gf70a60b"
}
},
"develop": {}

14
assets/mzn/6_basic_complete_transformed.mzn
View File

@ -1,16 +1,16 @@
var 1..5: s;@ \Vlabel{line:6:status:start}@
var 1..5: s; % <-- Status @ \Vlabel{line:6:status:start}@
constraint status(s);
var bool b1;
constraint int_ne_reif(s,1,b1); @\Vlabel{line:6:status:end}@ % b1 <-> status() != START
constraint int_ne_reif(s,1,b1); %@\Vlabel{line:6:status:end}@ b1 <-> status() != START
var 0.0..1.0: rnd1;@\Vlabel{line:6:x1:start}@
var 0.0..1.0: rnd1; % <-- Random Number @\Vlabel{line:6:x1:start}@
constraint float_uniform(0.0,1.0,rnd1);
var bool: b2;
constraint float_gt_reif(rnd1,0.2,b2);
var bool: b3;
constraint bool_and(b1,b2,b3);
var 1..3: x1;
constraint int_sol(x[1],x1);@\Vlabel{line:6:x1}@
% (status() != START /\textbackslash uniform(0.0, 1.0) > 0.2) -> x[1] = sol(x[1])
constraint int_eq_imp(x[1],x1,b3); @\Vlabel{line:6:x1:end}@
@...@
constraint int_sol(x[1],x1); % <-- Previous Solution @\Vlabel{line:6:x1}@
% (status() != START /\ uniform(0.0, 1.0) > 0.2) -> x[1] = sol(x[1])
constraint int_eq_imp(x[1],x1,b3); % <-- Neighbourhood Constraint @\Vlabel{line:6:x1:end}@
...