Updated demos/calc-two-dune.

demos/Makefile

@@ -31,7 +31,7 @@ clean::
 EXTRA := \
   calc-dune \
   calc-param-dune \
-#  calc-two-dune \
+  calc-two-dune \
 #  calc-incremental-dune \
 #  calc-inspection-dune \
 #  generate-printers-dune \

demos/calc-two-dune/Makefile

 .PHONY: all clean test
 
-DUNE       := jbuilder
+DUNE       := dune
 EXECUTABLE := calc.exe
 
 all:

demos/calc-two-dune/jbuild → demos/calc-two-dune/dune

-(jbuild_version 1)
-
-(ocamllex (lexer))
+(ocamllex
+  (modules lexer)
+)
 
 ; Compile tokens.mly into a definition of the type [token].
-(menhir (
-  (modules (tokens))
+(menhir
+  (modules tokens)
   (flags ("--only-tokens"))
-))
+)
 
 ; Compile reverse.mly into a parser.
-(menhir (
-  (modules (tokens reverse common))
+(menhir
+  (modules tokens reverse common)
   (merge_into reverse)
   (flags (
      "--external-tokens" "Tokens"
      "--unused-token" "LPAREN"
      "--unused-token" "RPAREN"
   ))
-))
+)
 
 ; Compile algebraic.mly into a parser.
-(menhir (
-  (modules (tokens algebraic common))
+(menhir
+  (modules tokens algebraic common)
   (merge_into algebraic)
   (flags ("--external-tokens" "Tokens"))
-))
+)
 
 (executable
-  ((name calc))
+  (name calc)
 )

demos/calc-two-dune/dune-project

+(lang dune 1.4)
+(using menhir 2.0)