rename typed-dict -> typed_dict etc. in expressions (fixes #2389)

src/julia-parser.scm

@@ -773,15 +773,15 @@
 		       (if (and (not(null? al)) (eq? (car al) 'comprehension))
 			  (if (and (not(null? (cdr al)))
 				   (dict-literal? (cadr al)))
-			      (loop (list* 'typed-dict-comprehension ex (cdr al)))
+			      (loop (list* 'typed_dict_comprehension ex (cdr al)))
 			      (error "invalid dict comprehension syntax"))
 			  (if (every dict-literal? al)
-			    (loop (list* 'typed-dict ex al))
+			    (loop (list* 'typed_dict ex al))
 			    (else (error "invalid dict literal"))))
 		       (if (any dict-literal? al)
 			 (error "invalid dict type specification")
 			 (if (and (not(null? al)) (eq? (car al) 'comprehension))
-			   (loop (list* 'typed-comprehension ex (cdr al)))
+			   (loop (list* 'typed_comprehension ex (cdr al)))
 			   (loop (list* 'ref ex al)))))))
 		  ((|.|)
 		   (take-token s)
@@ -1511,12 +1511,12 @@
 		 (cond ((eq? (car vex) 'comprehension)
 			(if (and (not (null? (cdr vex)))
 				 (dict-literal? (cadr vex)))
-			  `(typed-dict-comprehension (=> (top Any) (top Any)) ,@(cdr vex))
-			  `(typed-comprehension (top Any) ,@(cdr vex))))
+			  `(typed_dict_comprehension (=> (top Any) (top Any)) ,@(cdr vex))
+			  `(typed_comprehension (top Any) ,@(cdr vex))))
 		       ((and (eq? (car vex) 'vcat)
 			     (any dict-literal? (cdr vex)))
 			(if (every dict-literal? (cdr vex))
-			  `(typed-dict (=> (top Any) (top Any)) ,@(cdr vex))
+			  `(typed_dict (=> (top Any) (top Any)) ,@(cdr vex))
 			  (error "invalid dict literal")))
 		       ((eq? (car vex) 'hcat)
 			`(cell2d 1 ,(length (cdr vex)) ,@(cdr vex)))
@@ -1549,7 +1549,7 @@
 	   (let ((vex (parse-cat s #\])))
 	     (if (and (eq? (car vex) 'comprehension)
 		      (dict-literal? (cadr vex)))
-	       `(dict-comprehension ,@(cdr vex))
+	       `(dict_comprehension ,@(cdr vex))
 	       (if (any dict-literal? (cdr vex))
 		 (if (every dict-literal? (cdr vex))
 		   `(dict ,@(cdr vex))

src/julia-syntax.scm

@@ -921,13 +921,13 @@
 			  (tuple ,@(map caddr args))))
 
    ;; typed dict syntax
-   (pattern-lambda (typed-dict atypes . args)
+   (pattern-lambda (typed_dict atypes . args)
 		   (if (and (length= atypes 3)
 			    (eq? (car atypes) '=>))
 		       `(call (curly (top Dict) ,(cadr atypes) ,(caddr atypes))
 			      (tuple ,@(map cadr  args))
 			      (tuple ,@(map caddr args)))
-		       (error (string "invalid typed-dict syntax " atypes))))
+		       (error (string "invalid typed_dict syntax " atypes))))
 
    ;; cell array syntax
    (pattern-lambda (cell1d . args)
@@ -1178,7 +1178,7 @@
 
    ;; typed array comprehensions
    (pattern-lambda
-    (typed-comprehension atype expr . ranges)
+    (typed_comprehension atype expr . ranges)
     (if (any (lambda (x) (eq? x ':)) ranges)
 	(lower-nd-comprehension atype expr ranges)
     (let ( (result (gensy))
@@ -1213,7 +1213,7 @@
 
    ;; dict comprehensions
    (pattern-lambda
-    (dict-comprehension expr . ranges)
+    (dict_comprehension expr . ranges)
     (if (any (lambda (x) (eq? x ':)) ranges)
 	(error "invalid iteration syntax")
     (let ((result   (gensy))
@@ -1252,12 +1252,12 @@
 
    ;; typed dict comprehensions
    (pattern-lambda
-    (typed-dict-comprehension atypes expr . ranges)
+    (typed_dict_comprehension atypes expr . ranges)
     (if (any (lambda (x) (eq? x ':)) ranges)
 	(error "invalid iteration syntax")
     (if (not (and (length= atypes 3)
 		  (eq? (car atypes) '=>)))
-	(error "invalid typed-dict-comprehension syntax")
+	(error "invalid typed_dict_comprehension syntax")
     (let ( (result (gensy))
 	   (rs (map (lambda (x) (gensy)) ranges)) )